diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index 5c3f5a30da..61d8191072 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -9,6 +9,7 @@
 	import FlowConstants from './FlowConstants.svelte'
 	import type { FlowModule } from '$lib/gen'
 	import { initFlowStepWarnings } from '../utils'
+	import { dfs } from '../dfs'
 
 	export let noEditor = false
 	export let enableAi = false
@@ -41,7 +42,7 @@
 				flowStepWarnings: await initFlowStepWarnings(
 					module.value,
 					$flowStateStore?.[module?.id]?.schema ?? {},
-					$flowStore?.value?.modules?.map((m) => m.id) ?? []
+					dfs($flowStore.value.modules, (fm) => fm.id)
 				)
 			}
 		}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 16f831e916..e65e911126 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -46,6 +46,7 @@
 	import { loadSchemaFromModule } from '../flowInfers'
 	import { computeFlowStepWarning, initFlowStepWarnings } from '../utils'
 	import { debounce } from '$lib/utils'
+	import { dfs } from '../dfs'
 
 	const {
 		selectedId,
@@ -133,7 +134,7 @@
 						flowStepWarnings: await initFlowStepWarnings(
 							flowModule.value,
 							schema ?? {},
-							$flowStore?.value?.modules?.map((m) => m?.id) ?? []
+							dfs($flowStore.value.modules, (fm) => fm.id)
 						)
 					}
 				}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
index 2a3895a7d4..ed8884d539 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -19,6 +19,7 @@
 	import FlowBranchesOneWrapper from './FlowBranchesOneWrapper.svelte'
 	import FlowWhileLoop from './FlowWhileLoop.svelte'
 	import { initFlowStepWarnings } from '../utils'
+	import { dfs } from '../dfs'
 
 	export let flowModule: FlowModule
 	export let noEditor: boolean = false
@@ -68,7 +69,7 @@
 				flowStepWarnings: await initFlowStepWarnings(
 					module?.value,
 					$flowStateStore[module?.id]?.schema,
-					$flowStore.value.modules.map((m) => m.id)
+					dfs($flowStore.value.modules, (fm) => fm.id)
 				)
 			}
 		}
@@ -151,7 +152,7 @@
 							flowStepWarnings: await initFlowStepWarnings(
 								module.value,
 								$flowStateStore[module.id].schema,
-								$flowStore.value.modules.map((m) => m.id)
+								dfs($flowStore.value.modules, (fm) => fm.id)
 							)
 						}
 					}
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 5fa2497e79..1f69621c9d 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -194,7 +194,7 @@
 				flowStepWarnings: await initFlowStepWarnings(
 					module.value,
 					$flowStateStore?.[module.id]?.schema ?? {},
-					$flowStore?.value?.modules?.map((m) => m.id) ?? []
+					dfs($flowStore.value.modules, (fm) => fm.id)
 				)
 			}
 		}