diff --git a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
index 40cc3e192..756143217 100644
--- a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
+++ b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
@@ -193,29 +193,31 @@ export const MenuBar = ({
           setOpen={setOpenSettings}
         ></FlowSettingsModal>
       </div>
-      <ShadTooltip
-        content={
-          SAVED_HOVER +
-          new Date(currentFlow.updated_at ?? "").toLocaleString("en-US", {
-            hour: "numeric",
-            minute: "numeric",
-            second: "numeric",
-          })
-        }
-        side="bottom"
-        styleClasses="cursor-default"
-      >
-        <div className="flex cursor-default items-center gap-1.5 text-sm text-muted-foreground">
-          <IconComponent
-            name={isBuilding || saveLoading ? "Loader2" : "CheckCircle2"}
-            className={cn(
-              "h-4 w-4",
-              isBuilding || saveLoading ? "animate-spin" : "animate-wiggle"
-            )}
-          />
-          {printByBuildStatus()}
-        </div>
-      </ShadTooltip>
+      {(currentFlow.updated_at || saveLoading) && (
+        <ShadTooltip
+          content={
+            SAVED_HOVER +
+            new Date(currentFlow.updated_at ?? "").toLocaleString("en-US", {
+              hour: "numeric",
+              minute: "numeric",
+              second: "numeric",
+            })
+          }
+          side="bottom"
+          styleClasses="cursor-default"
+        >
+          <div className="flex cursor-default items-center gap-1.5 text-sm text-muted-foreground">
+            <IconComponent
+              name={isBuilding || saveLoading ? "Loader2" : "CheckCircle2"}
+              className={cn(
+                "h-4 w-4",
+                isBuilding || saveLoading ? "animate-spin" : "animate-wiggle"
+              )}
+            />
+            {printByBuildStatus()}
+          </div>
+        </ShadTooltip>
+      )}
     </div>
   ) : (
     <></>
diff --git a/src/frontend/src/stores/flowsManagerStore.ts b/src/frontend/src/stores/flowsManagerStore.ts
index 4ae8f4afa..020a3e796 100644
--- a/src/frontend/src/stores/flowsManagerStore.ts
+++ b/src/frontend/src/stores/flowsManagerStore.ts
@@ -56,7 +56,7 @@ const useFlowsManagerStore = create<FlowsManagerStoreType>((set, get) => ({
   setFlows: (flows: FlowType[]) => {
     set({
       flows,
-      // currentFlow: flows.find((flow) => flow.id === get().currentFlowId),
+      currentFlow: flows.find((flow) => flow.id === get().currentFlowId),
     });
   },
   currentFlow: undefined,
@@ -96,18 +96,14 @@ const useFlowsManagerStore = create<FlowsManagerStoreType>((set, get) => ({
         });
     });
   },
-  autoSaveCurrentFlow: debounce(
-    (nodes: Node[], edges: Edge[], viewport: Viewport) => {
-      set({ saveLoading: true });
-      if (get().currentFlow) {
-        get().saveFlow(
-          { ...get().currentFlow!, data: { nodes, edges, viewport } },
-          true
-        );
-      }
-    },
-    SAVE_DEBOUNCE_TIME
-  ),
+  autoSaveCurrentFlow: (nodes: Node[], edges: Edge[], viewport: Viewport) => {
+    if (get().currentFlow) {
+      get().saveFlow(
+        { ...get().currentFlow!, data: { nodes, edges, viewport } },
+        true
+      );
+    }
+  },
   saveFlow: debounce((flow: FlowType, silent?: boolean) => {
     set({ saveLoading: true });
     return new Promise<void>((resolve, reject) => {