diff --git a/PARR.API/Extensions/PaginationExtensions.cs b/PARR.API/Extensions/PaginationExtensions.cs
index cf283d89..e5130de0 100644
--- a/PARR.API/Extensions/PaginationExtensions.cs
+++ b/PARR.API/Extensions/PaginationExtensions.cs
@@ -46,16 +46,16 @@ namespace PARR.API.Extensions
         private static PagedResponse<T> CreatePaginatedResponse<T>(int totalItems, PaginationFilter paginationFilter, PagedResponse<T> pagedResponse)
         {
             pagedResponse.TotalItems = totalItems;
-            //pagedResponse.PageNumber = paginationFilter.PageNumber >= 1 ? paginationFilter.PageNumber : (int?)null;
-            //pagedResponse.PageSize = paginationFilter.PageSize >= 1 ? paginationFilter.PageSize : (int?)null;
+            pagedResponse.PageNumber = paginationFilter.PageNumber >= 1 ? paginationFilter.PageNumber : (int?)null;
+            pagedResponse.PageSize = paginationFilter.PageSize >= 1 ? paginationFilter.PageSize : (int?)null;
 
-            pagedResponse.PageNumber = paginationFilter.IsDisabledPagination 
-                                                            ? 1 
-                                                            : (paginationFilter.PageNumber >= 1 ? paginationFilter.PageNumber : (int?)null);
-            
-            pagedResponse.PageSize = paginationFilter.IsDisabledPagination 
-                                                            ? totalItems 
-                                                            : (paginationFilter.PageSize >= 1 ? paginationFilter.PageSize : (int?)null);
+            //pagedResponse.PageNumber = paginationFilter.IsDisabledPagination 
+            //                                                ? 1 
+            //                                                : (paginationFilter.PageNumber >= 1 ? paginationFilter.PageNumber : (int?)null);
+
+            //pagedResponse.PageSize = paginationFilter.IsDisabledPagination 
+            //                                                ? totalItems 
+            //                                                : (paginationFilter.PageSize >= 1 ? paginationFilter.PageSize : (int?)null);
 
             pagedResponse.TotalPage =
                (pagedResponse.TotalItems.HasValue && pagedResponse.PageSize.HasValue)