diff --git a/contexts/chat.tsx b/contexts/chat.tsx
index 0884231..73256d3 100644
--- a/contexts/chat.tsx
+++ b/contexts/chat.tsx
@@ -236,7 +236,7 @@ const ChatContextProvider: React.FC<ChatContextProps> = ({
       !socket ||
       !connected ||
       !initialFetch ||
-      (enableThread && !threadInitialized.current)
+      (enableThread && (!thread || !threadInitialized.current))
     )
       return;
     socket.emit(