diff --git a/space_flow/src/components/chatComponent/index.tsx b/space_flow/src/components/chatComponent/index.tsx
index f15da6827..4cb7432d4 100644
--- a/space_flow/src/components/chatComponent/index.tsx
+++ b/space_flow/src/components/chatComponent/index.tsx
@@ -25,11 +25,12 @@ export default function Chat({flow, reactFlowInstance }) {
       newChat.push({ message, isSend });
       return newChat;
     });
-    updateFlow({..._.cloneDeep(flow),chat:chatHistory})
-
   };
   useEffect(()=>{
-    // setChatHistory(flow.chat)
+    updateFlow({..._.cloneDeep(flow),chat:chatHistory})
+  },[chatHistory])
+  useEffect(()=>{
+    setChatHistory(flow.chat)
     console.log(flow.chat)
   },[flow])
   useEffect(()=>{
diff --git a/space_flow/src/contexts/tabsContext.tsx b/space_flow/src/contexts/tabsContext.tsx
index 2725d6bef..1d99dd69d 100644
--- a/space_flow/src/contexts/tabsContext.tsx
+++ b/space_flow/src/contexts/tabsContext.tsx
@@ -83,12 +83,14 @@ export function TabsProvider({children}){
         setTabIndex(flows.length);
       }
     function updateFlow(newFlow:flow){
+        console.log(newFlow)
         setFlows(prevState=>{
             const newFlows = [...prevState];
             const index = newFlows.findIndex(flow=>flow.id===newFlow.id)
             if(index!==-1){
                 newFlows[index].data = newFlow.data
                 newFlows[index].name = newFlow.name
+                newFlows[index].chat = newFlow.chat
             }
             return newFlows;
         });