diff --git a/apps/web/src/hooks/use-search.ts b/apps/web/src/hooks/use-search.ts
index 5647f3097..ca7a33c08 100644
--- a/apps/web/src/hooks/use-search.ts
+++ b/apps/web/src/hooks/use-search.ts
@@ -39,9 +39,14 @@ export function useSearch<T>(
     if (!query || !isSearching) return setFilteredItems(undefined);
     if (searchType !== type) return;
 
-    lookup(query, sortOptions || db.settings.getGroupOptions("search")).then(
-      (items) => setFilteredItems(items)
-    );
+    const cachedQuery = query;
+    lookup(
+      cachedQuery,
+      sortOptions || db.settings.getGroupOptions("search")
+    ).then((items) => {
+      if (useSearchStore.getState().query === cachedQuery)
+        setFilteredItems(items);
+    });
   }, [isSearching, query, searchType, type, sortOptions, ...deps]);
 
   return filteredItems;