diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 5b13868c6a..69cd2630db 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -118,6 +118,7 @@
 		if (leave) {
 			goto(`/flows/get/${$flowStore.path}?workspace_id=${$workspaceStore}`)
 		} else if (initialPath !== $flowStore.path) {
+			initialPath = $flowStore.path
 			goto(`/flows/edit/${$flowStore.path}?workspace_id=${$workspaceStore}`)
 		}
 	}
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index 16b27c11fc..1d5944a4e2 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -36,8 +36,6 @@
 
 	let selectedId: string = 'settings-metadata'
 
-	let initialPath: string = ''
-
 	async function loadFlow(): Promise<void> {
 		loading = true
 		let flow: Flow
@@ -52,7 +50,6 @@
 		}
 
 		await initFlow(flow, flowStore, flowStateStore)
-		initialPath = flow.path
 		loading = false
 		selectedId = stateLoadedFromUrl?.selectedId
 		$dirtyStore = false
@@ -65,4 +62,11 @@
 	}
 </script>
 
-<FlowBuilder {flowStore} {flowStateStore} {initialPath} {selectedId} {initialArgs} {loading} />
+<FlowBuilder
+	{flowStore}
+	{flowStateStore}
+	initialPath={$page.params.path}
+	{selectedId}
+	{initialArgs}
+	{loading}
+/>