diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx
index 75f68a1c..9737d904 100644
--- a/apps/readest-app/src/app/library/components/Bookshelf.tsx
+++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx
@@ -271,7 +271,9 @@ const Bookshelf: React.FC<BookshelfProps> = ({
     if (isSelectMode) {
       setShowSelectModeActions(true);
       if (isSelectAll) {
-        setSelectedBooks(filteredBooks.map((item) => item.hash));
+        setSelectedBooks(
+          currentBookshelfItems.map((item) => ('hash' in item ? item.hash : item.id)),
+        );
       } else if (isSelectNone) {
         setSelectedBooks([]);
       }
@@ -280,7 +282,7 @@ const Bookshelf: React.FC<BookshelfProps> = ({
       setShowSelectModeActions(false);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isSelectMode, isSelectAll, isSelectNone, filteredBooks]);
+  }, [isSelectMode, isSelectAll, isSelectNone, currentBookshelfItems]);
 
   useEffect(() => {
     eventDispatcher.on('delete-books', handleDeleteBooksIntent);
diff --git a/apps/readest-app/src/app/library/page.tsx b/apps/readest-app/src/app/library/page.tsx
index e94a5660..8a5495ff 100644
--- a/apps/readest-app/src/app/library/page.tsx
+++ b/apps/readest-app/src/app/library/page.tsx
@@ -614,6 +614,8 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP
     } else {
       params.delete('group');
     }
+    setIsSelectAll(false);
+    setIsSelectNone(false);
     navigateToLibrary(router, `${params.toString()}`);
     setTimeout(() => {
       setCurrentGroupPath(path);