diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 9f289dc58..e63441dc8 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="bookshelf" class="w-full overflow-y-auto">
     <template v-for="shelf in totalShelves">
-      <div :key="shelf" :id="`shelf-${shelf - 1}`" class="w-full px-4 sm:px-8 relative"
-        :class="{ bookshelfRow: !isAlternativeBookshelfView }" :style="{ height: shelfHeight + 'px' }">
-        <div v-if="!isAlternativeBookshelfView" class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20"
-          :class="`h-${shelfDividerHeightIndex}`" />
+      <div :key="shelf" :id="`shelf-${shelf - 1}`" class="w-full px-4 sm:px-8 relative" :class="{ bookshelfRow: !isAlternativeBookshelfView }" :style="{ height: shelfHeight + 'px' }">
+        <div v-if="!isAlternativeBookshelfView" class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20" :class="`h-${shelfDividerHeightIndex}`" />
       </div>
     </template>
 
-    <div v-if="initialized && !totalShelves && !hasFilter && entityName === 'books'"
-      class="w-full flex flex-col items-center justify-center py-12">
+    <div v-if="initialized && !totalShelves && !hasFilter && entityName === 'books'" class="w-full flex flex-col items-center justify-center py-12">
       <p class="text-center text-2xl font-book mb-4 py-4">{{ libraryName }} Library is empty!</p>
       <div v-if="userIsAdminOrUp" class="flex">
         <ui-btn to="/config" color="primary" class="w-52 mr-2">Configure Scanner</ui-btn>
@@ -335,20 +332,9 @@ export default {
           }
         }
 
-        this.$eventBus.$emit('bookshelf-total-entities', this.getEntitiesCount())
+        this.$eventBus.$emit('bookshelf-total-entities', this.totalEntities)
       }
     },
-    getEntitiesCount() {
-      let uniqueEntities = new Set()
-      this.entities.forEach(entity => {
-        if (entity.collapsedSeries) {
-          entity.collapsedSeries.libraryItemIds.forEach(uniqueEntities.add, uniqueEntities)
-        } else {
-          uniqueEntities.add(entity.id)
-        }
-      });
-      return uniqueEntities.size
-    },
     loadPage(page) {
       this.pagesLoaded[page] = true
       this.fetchEntites(page)
@@ -531,8 +517,8 @@ export default {
         var indexOf = this.entities.findIndex((ent) => ent && ent.id === libraryItem.id)
         if (indexOf >= 0) {
           this.entities = this.entities.filter((ent) => ent.id !== libraryItem.id)
-          this.totalEntities = this.entities.length
-          this.$eventBus.$emit('bookshelf-total-entities', this.getEntitiesCount())
+          this.totalEntities--
+          this.$eventBus.$emit('bookshelf-total-entities', this.totalEntities)
           this.executeRebuild()
         }
       }
@@ -569,8 +555,8 @@ export default {
       var indexOf = this.entities.findIndex((ent) => ent && ent.id === collection.id)
       if (indexOf >= 0) {
         this.entities = this.entities.filter((ent) => ent.id !== collection.id)
-        this.totalEntities = this.entities.length
-        this.$eventBus.$emit('bookshelf-total-entities', this.getEntitiesCount())
+        this.totalEntities--
+        this.$eventBus.$emit('bookshelf-total-entities', this.totalEntities)
         this.executeRebuild()
       }
     },
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index dd818db55..cd055e5c5 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -188,7 +188,17 @@ class LibraryController {
 
       if (!(collapsedItems.length == 1 && collapsedItems[0].collapsedSeries)) {
         libraryItems = collapsedItems
-        payload.total = libraryItems.length
+
+        // Get accurate total entities
+        let uniqueEntities = new Set()
+        libraryItems.forEach((item) => {
+          if (item.collapsedSeries) {
+            item.collapsedSeries.books.forEach(book => uniqueEntities.add(book.id))
+          } else {
+            uniqueEntities.add(item.id)
+          }
+        })
+        payload.total = uniqueEntities.size
       }
     }
 
@@ -265,6 +275,12 @@ class LibraryController {
       libraryItems = naturalSort(libraryItems).by(sortArray)
     }
 
+    // Step 3.5: Limit items
+    if (payload.limit) {
+      var startIndex = payload.page * payload.limit
+      libraryItems = libraryItems.slice(startIndex, startIndex + payload.limit)
+    }
+
     // Step 4 - Transform the items to pass to the client side
     payload.results = libraryItems.map(li => {
       let json = payload.minified ? li.toJSONMinified() : li.toJSON()