diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs
index 6ec7a20..99cbad7 100644
--- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs
+++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs
@@ -79,7 +79,7 @@ public class WishlistsService : IWishlistsService
 
     public async Task<PagedList<WishlistDto>> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken)
     {
-        var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, cancellationToken);
+        var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id, cancellationToken);
         var dtos = _mapper.Map<List<WishlistDto>>(entities);
         var count = await _wishlistsRepository.GetTotalCountAsync();
         return new PagedList<WishlistDto>(dtos, pageNumber, pageSize, count);
diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs
index 565112e..319942d 100644
--- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs
+++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs
@@ -69,4 +69,4 @@ public abstract class BaseRepository<TEntity> where TEntity : EntityBase
         return await this._collection.FindOneAndUpdateAsync(
             Builders<TEntity>.Filter.Eq(e => e.Id, entity.Id), updateDefinition, options, cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs
index 23f9b8f..2181ac5 100644
--- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs
+++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs
@@ -14,8 +14,11 @@ public class MessagesRepository : BaseRepository<Message>, IMessagesRepository
     {
         var messageCount = await GetCountAsync(predicate, cancellationToken);
 
+        pageSize = Math.Clamp(pageSize, 1, messageCount);
+        var numberOfPages = messageCount / pageSize;
+
         return await _collection.Find(predicate)
-                                .Skip((messageCount / pageSize - pageNumber) * pageSize)
+                                .Skip((numberOfPages - pageNumber) * pageSize)
                                 .Limit(pageSize)
                                 .ToListAsync(cancellationToken);
     }
diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs
index 2c64d42..2e2a97d 100644
--- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs
+++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs
@@ -86,7 +86,7 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
             variables = new
             {
                 pageNumber = 1,
-                pageSize = 1
+                pageSize = 5
             }
         };
 
@@ -212,8 +212,6 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
         var responseString = await response.Content.ReadAsStringAsync();
         var document = JsonConvert.DeserializeObject<dynamic>(responseString);
 
-        Console.WriteLine(document.data.messagesPageFromPersonalWishlist);
-
         var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items);
         var firstMessageInPage = messagesPageFromPersonalWishlist[0];
         var secondMessageInPage = messagesPageFromPersonalWishlist[1];
@@ -286,6 +284,71 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
         Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
     }
 
+    [Fact]
+    public async Task GetPersonalWishlistsPage_InValidPageNumber_ReturnsEmptyList()
+    {
+        var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient);
+        _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken);
+        var user = await UserExtention.GetCurrentUser(_httpClient);
+
+        var query = new
+        {
+            query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }",
+            variables = new
+            {
+                pageNumber = 100,
+                pageSize = 1
+            }
+        };
+
+        var jsonPayload = JsonConvert.SerializeObject(query);
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+
+        using var response = await _httpClient.PostAsync("graphql", content);
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+        var responseString = await response.Content.ReadAsStringAsync();
+        var document = JsonConvert.DeserializeObject<dynamic>(responseString);
+
+        var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items);
+
+        Assert.Empty(personalWishlistsPageItems);
+    }
+
+    [Fact]
+    public async Task GetPersonalWishlistsPage_InValidPageSize_ReturnsPage()
+    {
+        var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient);
+        _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken);
+        var user = await UserExtention.GetCurrentUser(_httpClient);
+
+        var query = new
+        {
+            query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }",
+            variables = new
+            {
+                pageNumber = 1,
+                pageSize = 100
+            }
+        };
+
+        var jsonPayload = JsonConvert.SerializeObject(query);
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+
+        using var response = await _httpClient.PostAsync("graphql", content);
+        response.EnsureSuccessStatusCode();
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+        var responseString = await response.Content.ReadAsStringAsync();
+        var document = JsonConvert.DeserializeObject<dynamic>(responseString);
+
+        var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items);
+        var personalWishlistCreatedById = (string) personalWishlistsPageItems[0].createdById;
+
+        Assert.NotEmpty(personalWishlistsPageItems);
+        Assert.Equal(user.Id, personalWishlistCreatedById);
+    }
+
     [Fact]
     public async Task GetPersonalWishlist_InvalidWishlistId_ReturnsInternalServerError()
     {
@@ -362,7 +425,7 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
     }
 
     [Fact]
-    public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsInternalServerError()
+    public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsEmptyList()
     {
         var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient);
         _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken);
@@ -387,7 +450,7 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
     }
 
     [Fact]
-    public async Task GetMessagesPageFromPersonalWishlist_InValidPageSize_ReturnsInternalServerError()
+    public async Task GetMessagesPageFromPersonalWishlist_InValidPageSize_ReturnsPage()
     {
         var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient);
         _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken);
@@ -408,7 +471,18 @@ public class WishlistsTests : IClassFixture<TestingFactory<Program>>
         var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
 
         using var response = await _httpClient.PostAsync("graphql", content);
-        Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+        var responseString = await response.Content.ReadAsStringAsync();
+        var document = JsonConvert.DeserializeObject<dynamic>(responseString);
+
+        var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items);
+        var firstMessageInPage = messagesPageFromPersonalWishlist[0];
+        var secondMessageInPage = messagesPageFromPersonalWishlist[1];
+
+        Assert.Equal("Message 1", (string) firstMessageInPage.text);
+        Assert.Equal(MessageRoles.User.ToString(), (string) firstMessageInPage.role);
+        Assert.Equal(user.Id, (string) firstMessageInPage.createdById);
     }
 
     [Fact]