diff --git a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/chat-message.tsx b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/chat-message.tsx
index 981313140..cec9357d3 100644
--- a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/chat-message.tsx
+++ b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/chat-message.tsx
@@ -313,8 +313,10 @@ export default function ChatMessage({
                 contentBlocks={chat.content_blocks}
                 isLoading={
                   chatMessage === "" &&
+                  lockChat &&
+                  chat.properties?.state === "partial" &&
                   isBuilding &&
-                  chat.properties?.state === "partial"
+                  lastMessage
                 }
                 state={chat.properties?.state}
                 chatId={chat.id}