diff --git a/client/package-lock.json b/client/package-lock.json
index b1b53d1a37..4648305633 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -56,7 +56,6 @@
         "tailwindcss-animate": "^1.0.5",
         "tailwindcss-radix": "^2.8.0",
         "url": "^0.11.0",
-        "use-react-screenshot": "github:danny-avila/use-react-screenshot#master",
         "uuidv4": "^6.2.13"
       },
       "devDependencies": {
@@ -13268,19 +13267,6 @@
         }
       }
     },
-    "node_modules/use-react-screenshot": {
-      "version": "3.0.0",
-      "resolved": "git+ssh://git@github.com/danny-avila/use-react-screenshot.git#59260177849fc8d635170835e2f89ae2a126b7b6",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8",
-        "npm": ">=5"
-      },
-      "peerDependencies": {
-        "html2canvas": "^1.4.1",
-        "react": "^18.2.0"
-      }
-    },
     "node_modules/use-sidecar": {
       "version": "1.1.2",
       "license": "MIT",
@@ -21955,11 +21941,6 @@
         "use-isomorphic-layout-effect": "^1.1.1"
       }
     },
-    "use-react-screenshot": {
-      "version": "git+ssh://git@github.com/danny-avila/use-react-screenshot.git#59260177849fc8d635170835e2f89ae2a126b7b6",
-      "from": "use-react-screenshot@github:danny-avila/use-react-screenshot#master",
-      "requires": {}
-    },
     "use-sidecar": {
       "version": "1.1.2",
       "requires": {
diff --git a/client/src/components/Nav/index.jsx b/client/src/components/Nav/index.jsx
index 86feff0212..b63cf11e7e 100644
--- a/client/src/components/Nav/index.jsx
+++ b/client/src/components/Nav/index.jsx
@@ -39,28 +39,26 @@ export default function Nav({ navVisible, setNavVisible }) {
 
   const [isFetching, setIsFetching] = useState(false);
 
-  const onSearchSuccess = (data, expectedPage) => {
-    console.log('onSearchSuccess', data, expectedPage)
-    const res = data;
-    setConversations(res.conversations);
-    if (expectedPage) {
-      setPageNumber(expectedPage);
-    }
-    setPageNumber(res.pageNumber);
-    setPages(res.pages);
-    setIsFetching(false);
-    searchPlaceholderConversation();
-    setSearchResultMessages(res.messages);
-  };
-
   const debouncedSearchTerm = useDebounce(searchQuery, 750);
-  const searchQueryFn = useSearchQuery(debouncedSearchTerm, 1, { 
+  const searchQueryFn = useSearchQuery(debouncedSearchTerm, pageNumber, { 
     enabled: !!debouncedSearchTerm && 
     debouncedSearchTerm.length > 0 &&
     isSearchEnabled && 
     isSearching,
   });
 
+  const onSearchSuccess = (data, expectedPage) => {
+    const res = data;
+    setConversations(res.conversations);
+    if (expectedPage) {
+      setPageNumber(expectedPage);
+    }
+    setPages(res.pages);
+    setIsFetching(false);
+    searchPlaceholderConversation();
+    setSearchResultMessages(res.messages);
+  };
+
   useEffect(() => {
     //we use isInitialLoading here instead of isLoading because query is disabled by default
     if (searchQueryFn.isInitialLoading) {
@@ -81,24 +79,12 @@ export default function Nav({ navVisible, setNavVisible }) {
 
   const nextPage = async () => {
     moveToTop();
-
-    if (!isSearching) {
-      setPageNumber(prev => prev + 1);
-      await getConversationsQuery.refetch()
-    } else {
-      await fetch(searchQuery, +pageNumber + 1);
-    }
+    setPageNumber(pageNumber + 1);
   };
 
   const previousPage = async () => {
     moveToTop();
-
-    if (!isSearching) {
-      setPageNumber(prev => prev - 1);
-      await getConversationsQuery.refetch()
-    } else {
-      await fetch(searchQuery, +pageNumber - 1);
-    }
+    setPageNumber(pageNumber - 1);
   };
 
   useEffect(() => {