diff --git a/src/shared/hooks/useCases/useDiscussionMessagesById.ts b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
index 1b7370a5b..e4a946d2a 100644
--- a/src/shared/hooks/useCases/useDiscussionMessagesById.ts
+++ b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
@@ -311,7 +311,15 @@ export const useDiscussionMessagesById = ({
 
   useDeepCompareEffect(() => {
     (async () => {
-      if (!state.data || state.data.length === 0) {
+      if(Array.isArray(state.data) && state.data.length === 0) {
+        setIsFirstBatchLoaded((prev) => ({
+          ...prev,
+          [discussionId]: true,
+        }));
+        setDiscussionMessagesWithOwners([]);
+      }
+
+      if (!state.data) {
         setDiscussionMessagesWithOwners([]);
         return;
       }