diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index e5fdc6d9d..69dc29408 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -49,7 +49,7 @@ const getColsForWidth = (width) => {
   if (width === 'sm') return 3
   if (width === 'md') return 4
   if (width === 'lg') return 6
-  return 6
+  return 9
 }
 
 const Cover = withContentRect('bounds')(
diff --git a/ui/src/common/useAlbumsPerPage.js b/ui/src/common/useAlbumsPerPage.js
index 94c116eee..14c465110 100644
--- a/ui/src/common/useAlbumsPerPage.js
+++ b/ui/src/common/useAlbumsPerPage.js
@@ -6,7 +6,7 @@ const getPerPage = (width) => {
   if (width === 'sm') return 12
   if (width === 'md') return 15
   if (width === 'lg') return 18
-  return 21
+  return 36
 }
 
 const getPerPageOptions = (width) => {