diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index 92a0399142..39e503750c 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -104,7 +104,9 @@
 							{#if $flowStore.value.modules}
 								<FlowGraph
 									on:click={(e) => {
-										$selectedId = e.detail.id
+										if (e.detail.id) {
+											$selectedId = e.detail.id
+										}
 									}}
 									minHeight={topHeight}
 									modules={$flowStore.value.modules}
diff --git a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
index b7e091d6c6..56dfe4dd14 100644
--- a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
+++ b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
@@ -17,6 +17,7 @@
 	let job: Job | undefined = undefined
 
 	$: upToDisabled =
+		$selectedId == undefined ||
 		[
 			'settings',
 			'settings-schedule',
@@ -26,7 +27,8 @@
 			'inputs',
 			'schedules',
 			'failure'
-		].includes($selectedId) || $selectedId?.includes('branch')
+		].includes($selectedId) ||
+		$selectedId?.includes('branch')
 </script>
 
 <div class="flex flex-row-reverse justify-between items-center gap-x-2">
diff --git a/frontend/src/lib/components/graph/FlowGraph.svelte b/frontend/src/lib/components/graph/FlowGraph.svelte
index 172d3a086f..d740bcef82 100644
--- a/frontend/src/lib/components/graph/FlowGraph.svelte
+++ b/frontend/src/lib/components/graph/FlowGraph.svelte
@@ -275,7 +275,7 @@
 		loop.items.push(
 			createVirtualNode(
 				getParentIds(loop.items),
-				`Collect iterations' results of For Loop ${module.id}`,
+				`Collect iterations' results of For Loop ${module.id ?? ''}`,
 				undefined,
 				1000
 			)