diff --git a/src/frontend/src/components/newChatView/chatMessage/index.tsx b/src/frontend/src/components/newChatView/chatMessage/index.tsx
index 8b2c181f5..4f6d8e534 100644
--- a/src/frontend/src/components/newChatView/chatMessage/index.tsx
+++ b/src/frontend/src/components/newChatView/chatMessage/index.tsx
@@ -19,6 +19,7 @@ export default function ChatMessage({
   lockChat,
   lastMessage,
   updateChat,
+  setLockChat
 }: chatMessagePropsType): JSX.Element {
   const convert = new Convert({ newline: true });
   const [hidden, setHidden] = useState(true);
@@ -73,14 +74,17 @@ export default function ChatMessage({
   useEffect(() => {
     console.log("chatMessage", chatMessage);
     if (streamUrl && !isStreaming) {
+      setLockChat(true);
       streamChunks(streamUrl)
         .then(() => {
+          setLockChat(false);
           if (updateChat) {
             updateChat(chat, chatMessageRef.current);
           }
         })
         .catch((error) => {
           console.error(error);
+          setLockChat(false);
         });
     }
   }, [streamUrl, chatMessage]);
diff --git a/src/frontend/src/components/newChatView/index.tsx b/src/frontend/src/components/newChatView/index.tsx
index 72a203cb8..b1f888f1c 100644
--- a/src/frontend/src/components/newChatView/index.tsx
+++ b/src/frontend/src/components/newChatView/index.tsx
@@ -160,6 +160,7 @@ export default function NewChatView({
           {chatHistory?.length > 0 ? (
             chatHistory.map((chat, index) => (
               <ChatMessage
+              setLockChat={setLockChat}
                 lockChat={lockChat}
                 chat={chat}
                 lastMessage={chatHistory.length - 1 === index ? true : false}
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index b36b5d44c..30a32ba19 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -524,6 +524,7 @@ export type chatMessagePropsType = {
   chat: ChatMessageType;
   lockChat: boolean;
   lastMessage: boolean;
+  setLockChat: (lock: boolean) => void;
   updateChat: (
     chat: ChatMessageType,
     message: string,