diff --git a/src/frontend/src/contexts/flowsContext.tsx b/src/frontend/src/contexts/flowsContext.tsx
index a43e62722..a5d4ce8d1 100644
--- a/src/frontend/src/contexts/flowsContext.tsx
+++ b/src/frontend/src/contexts/flowsContext.tsx
@@ -153,17 +153,19 @@ export function FlowsProvider({ children }: { children: ReactNode }) {
   const onNodesChange = useCallback(
     (change: NodeChange[]) => {
       onNodesChangeInternal(change);
-      setPending(true);
+      if(!isPending)
+        setPending(true);
     },
-    [onNodesChangeInternal, setTabsState, tabId]
+    [onNodesChangeInternal, setPending, isPending]
   );
 
   const onEdgesChange = useCallback(
     (edges: EdgeChange[]) => {
       onEdgesChangeInternal(edges);
-      setPending(true);
+      if(!isPending)
+        setPending(true);
     },
-    [onEdgesChangeInternal, setTabsState, tabId]
+    [onEdgesChangeInternal, setPending, isPending]
   );
 
   const setNodes = (change: Node[] | ((oldState: Node[]) => Node[])) => {
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index a28321302..ce537084b 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -213,7 +213,7 @@ export default function Page({
 
   const onNodeDragStop: NodeDragHandler = useCallback(() => {
     // 👇 make dragging a node undoable
-    saveFlow();
+    saveFlow(undefined, true);
     // 👉 you can place your event handlers here
   }, [takeSnapshot]);