diff --git a/frontend/src/hooks/useChatSession.ts b/frontend/src/hooks/useChatSession.ts
index 234183ce6..c533cbf15 100644
--- a/frontend/src/hooks/useChatSession.ts
+++ b/frontend/src/hooks/useChatSession.ts
@@ -316,7 +316,8 @@ export function useChatSession(
     currentStreamingMessage,
     appendUserMessage,
     streamAssistant,
-    streamingError
+    streamingError,
+    isPending
   };
 }
 
diff --git a/frontend/src/routes/_auth.chat.$chatId.tsx b/frontend/src/routes/_auth.chat.$chatId.tsx
index bf427119f..582bb11f0 100644
--- a/frontend/src/routes/_auth.chat.$chatId.tsx
+++ b/frontend/src/routes/_auth.chat.$chatId.tsx
@@ -190,7 +190,8 @@ function ChatComponent() {
     phase,
     currentStreamingMessage,
     appendUserMessage,
-    streamingError
+    streamingError,
+    isPending
   } = useChatSession(chatId, {
     getChatById,
     persistChat,
@@ -587,7 +588,7 @@ END OF INSTRUCTIONS`;
           <ChatBox
             onSubmit={sendMessage}
             messages={localChat.messages}
-            isStreaming={isLoading || isPersisting || isSummarizing}
+            isStreaming={isLoading || isPersisting || isSummarizing || isPending}
             onCompress={compressChat}
             isSummarizing={isSummarizing}
             imageConversionError={imageConversionError}