diff --git a/src/components/left/search/AudioResults.tsx b/src/components/left/search/AudioResults.tsx
index 7b60a4460..618b0d584 100644
--- a/src/components/left/search/AudioResults.tsx
+++ b/src/components/left/search/AudioResults.tsx
@@ -54,7 +54,8 @@ const AudioResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [currentType, lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [currentType, lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const foundMessages = useMemo(() => {
     if (!foundIds || !globalMessagesByChatId) {
diff --git a/src/components/left/search/ChatMessageResults.tsx b/src/components/left/search/ChatMessageResults.tsx
index 7d52896c3..cfe7a1b33 100644
--- a/src/components/left/search/ChatMessageResults.tsx
+++ b/src/components/left/search/ChatMessageResults.tsx
@@ -64,7 +64,8 @@ const ChatMessageResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const handleTopicClick = useCallback(
     (id: number) => {
diff --git a/src/components/left/search/ChatResults.tsx b/src/components/left/search/ChatResults.tsx
index d0a7c89e6..55082e756 100644
--- a/src/components/left/search/ChatResults.tsx
+++ b/src/components/left/search/ChatResults.tsx
@@ -16,6 +16,7 @@ import {
 import { MEMO_EMPTY_ARRAY } from '../../../util/memo';
 import { throttle } from '../../../util/schedulers';
 import { renderMessageSummary } from '../../common/helpers/renderMessageText';
+
 import useLang from '../../../hooks/useLang';
 import useHorizontalScroll from '../../../hooks/useHorizontalScroll';
 import useAppLayout from '../../../hooks/useAppLayout';
@@ -85,7 +86,8 @@ const ChatResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const handleChatClick = useCallback(
     (id: string) => {
diff --git a/src/components/left/search/FileResults.tsx b/src/components/left/search/FileResults.tsx
index d8a8e02db..806ce3abc 100644
--- a/src/components/left/search/FileResults.tsx
+++ b/src/components/left/search/FileResults.tsx
@@ -66,7 +66,8 @@ const FileResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const foundMessages = useMemo(() => {
     if (!foundIds || !globalMessagesByChatId) {
diff --git a/src/components/left/search/LinkResults.tsx b/src/components/left/search/LinkResults.tsx
index 4346482fb..8f9a8c953 100644
--- a/src/components/left/search/LinkResults.tsx
+++ b/src/components/left/search/LinkResults.tsx
@@ -64,7 +64,8 @@ const LinkResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const foundMessages = useMemo(() => {
     if (!foundIds || !globalMessagesByChatId) {
diff --git a/src/components/left/search/MediaResults.tsx b/src/components/left/search/MediaResults.tsx
index f9ce541fc..453ee5c86 100644
--- a/src/components/left/search/MediaResults.tsx
+++ b/src/components/left/search/MediaResults.tsx
@@ -62,7 +62,8 @@ const MediaResults: FC<OwnProps & StateProps> = ({
         });
       });
     }
-  }, [lastSyncTime, searchMessagesGlobal]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- `searchQuery` is required to prevent infinite message loading
+  }, [lastSyncTime, searchMessagesGlobal, searchQuery]);
 
   const foundMessages = useMemo(() => {
     if (!foundIds || !globalMessagesByChatId) {