diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index 71931b18c..5ca200ace 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -187,7 +187,15 @@ export default function Page({
         let updatedSeconds = prevSeconds + 1;
 
         if (updatedSeconds % 30 === 0) {
-          saveFlow(flow, true);
+          saveFlow(
+            {
+              ...flow!,
+              data: reactFlowInstance
+                ? reactFlowInstance!.toObject()
+                : flow!.data,
+            },
+            true
+          );
           updatedSeconds = 0;
         }
 
@@ -366,7 +374,10 @@ export default function Page({
   useEffect(() => {
     return () => {
       if (tabsState && tabsState[flow.id]?.isPending) {
-        saveFlow(flow);
+        saveFlow({
+          ...flow!,
+          data: reactFlowInstance ? reactFlowInstance!.toObject() : flow!.data,
+        });
       }
     };
   }, []);
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index 35e1d78bd..779f299a3 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -250,7 +250,7 @@ export default function ExtraSidebar(): JSX.Element {
                   (isPending ? "" : "button-disable")
                 }
                 onClick={(event) => {
-                  saveFlow(flow!);
+                  saveFlow({ ...flow!, data: reactFlowInstance!.toObject() });
                 }}
               >
                 <IconComponent