diff --git a/src/components/common/Pagination.tsx b/src/components/common/Pagination.tsx
index 02775f44cc..1c0e9de2a2 100644
--- a/src/components/common/Pagination.tsx
+++ b/src/components/common/Pagination.tsx
@@ -16,7 +16,7 @@ const Pagination: FC<PaginationProps> = ({ viewQuerySettings, setViewQuerySettin
     const totalRecordCount = itemsResult.TotalRecordCount || 0;
     const startIndex = viewQuerySettings.StartIndex || 0;
     const recordsEnd = Math.min(startIndex + limit, totalRecordCount);
-    const showControls = limit < totalRecordCount;
+    const showControls = limit > 0 && limit < totalRecordCount;
     const element = useRef<HTMLDivElement>(null);
 
     const onNextPageClick = useCallback(() => {
diff --git a/src/components/common/ViewItemsContainer.tsx b/src/components/common/ViewItemsContainer.tsx
index f5e80b4b40..086d160137 100644
--- a/src/components/common/ViewItemsContainer.tsx
+++ b/src/components/common/ViewItemsContainer.tsx
@@ -274,7 +274,7 @@ const ViewItemsContainer: FC<ViewItemsContainerProps> = ({
             Fields: fields,
             ImageTypeLimit: 1,
             EnableImageTypes: 'Primary,Backdrop,Banner,Thumb,Disc,Logo',
-            Limit: userSettings.libraryPageSize(undefined),
+            Limit: userSettings.libraryPageSize(undefined) || undefined,
             IsFavorite: getBasekey() === 'favorites' ? true : null,
             VideoTypes: viewQuerySettings.VideoTypes,
             GenreIds: viewQuerySettings.GenreIds,