diff --git a/src/frontend/src/contexts/flowsContext.tsx b/src/frontend/src/contexts/flowsContext.tsx
index db20b3745..1c5b97aeb 100644
--- a/src/frontend/src/contexts/flowsContext.tsx
+++ b/src/frontend/src/contexts/flowsContext.tsx
@@ -595,14 +595,16 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
         newFlows[index].data = newFlow.data;
         newFlows[index].name = newFlow.name;
       }
+      newFlow = {
+        ...newFlow,
+      };
       return newFlows;
     });
   }
 
   async function saveFlow(newFlow: FlowType, silent?: boolean) {
-    console.log(newFlow);
-
     if (newFlow?.data?.nodes?.length === 0) return;
+
     try {
       // updates flow in db
       const updatedFlow = await updateFlowInDatabase(newFlow);
@@ -615,14 +617,10 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
           const newFlows = [...prevState];
           const index = newFlows.findIndex((flow) => flow.id === newFlow.id);
           if (index !== -1) {
-            newFlows[index] = {
-              ...newFlows[index],
-              description: updatedFlow.description,
-              data: updatedFlow.data,
-              name: updatedFlow.name,
-            };
+            newFlows[index].description = newFlow.description ?? "";
+            newFlows[index].data = newFlow.data;
+            newFlows[index].name = newFlow.name;
           }
-
           return newFlows;
         });
         //update tabs state
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index 277740274..872d3d37c 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -70,6 +70,7 @@ export default function Page({
     saveFlow,
     setTabsState,
     tabId,
+    flows,
   } = useContext(FlowsContext);
   const {
     types,
@@ -182,6 +183,8 @@ export default function Page({
   const [seconds, setSeconds] = useState(0);
 
   useEffect(() => {
+    const index = flows.findIndex((flowId) => flowId.id === flow.id);
+
     const interval = setInterval(() => {
       setSeconds((prevSeconds) => {
         let updatedSeconds = prevSeconds + 1;
@@ -189,7 +192,7 @@ export default function Page({
         if (updatedSeconds % 30 === 0) {
           saveFlow(
             {
-              ...flow!,
+              ...flows[index]!,
               data: reactFlowInstance
                 ? reactFlowInstance!.toObject()
                 : flow!.data,