diff --git a/web/search/message-search-state-provider.react.js b/web/search/message-search-state-provider.react.js
--- a/web/search/message-search-state-provider.react.js
+++ b/web/search/message-search-state-provider.react.js
@@ -143,15 +143,16 @@
       }
       queryIDRef.current += 1;
       loading.current = true;
+      const query = getQuery(threadID);
       searchMessagesCall(
-        queries.current[threadID],
+        query,
         threadID,
         appendResults,
         queryIDRef.current,
         lastIDs.current[threadID],
       );
     },
-    [appendResults, endsReached, searchMessagesCall],
+    [appendResults, getQuery, searchMessagesCall],
   );
 
   const state = React.useMemo(