diff --git a/frontend/src/lib/components/flows/content/FlowBranchesWrapper.svelte b/frontend/src/lib/components/flows/content/FlowBranchesWrapper.svelte
index a7fa12c415..0433fee414 100644
--- a/frontend/src/lib/components/flows/content/FlowBranchesWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowBranchesWrapper.svelte
@@ -9,7 +9,6 @@
 
 	export let flowModule: FlowModule
 	export let parentModule: FlowModule | undefined
-	export let previousModuleId: string | undefined
 
 	let selected: string = 'retries'
 </script>
@@ -30,7 +29,7 @@
 
 				<TabContent value="early-stop" class="flex flex-col flex-1 h-full">
 					<div class="p-4 overflow-y-auto">
-						<FlowModuleEarlyStop bind:flowModule {parentModule} {previousModuleId} />
+						<FlowModuleEarlyStop bind:flowModule {parentModule} />
 					</div>
 				</TabContent>
 
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index d023f9da88..5daf9dc14a 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -98,7 +98,7 @@
 
 							<TabContent value="early-stop" class="flex flex-col flex-1 h-full">
 								<div class="p-4 overflow-y-auto">
-									<FlowModuleEarlyStop bind:flowModule={mod} {parentModule} {previousModuleId} />
+									<FlowModuleEarlyStop bind:flowModule={mod} {parentModule} />
 								</div>
 							</TabContent>
 
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 59f32e63db..9f009ef9f3 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -209,7 +209,6 @@
 									bind:flowModule
 									class="px-4 pb-4 h-full overflow-auto"
 									{parentModule}
-									{previousModuleId}
 								/>
 							{:else if selected === 'suspend'}
 								<div class="px-4 pb-4 h-full overflow-auto">
diff --git a/frontend/src/lib/components/flows/content/FlowModuleEarlyStop.svelte b/frontend/src/lib/components/flows/content/FlowModuleEarlyStop.svelte
index 2b163f0ac9..4a9fa2ecb4 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleEarlyStop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleEarlyStop.svelte
@@ -13,19 +13,25 @@
 
 	export let flowModule: FlowModule
 	export let parentModule: FlowModule | undefined
-	export let previousModuleId: string | undefined
 
 	let editor: SimpleEditor | undefined = undefined
 
 	$: isStopAfterIfEnabled = Boolean(flowModule.stop_after_if)
 
-	$: pickableProperties = getStepPropPicker(
-		$flowStateStore,
-		parentModule,
-		previousModuleId,
-		$flowStore,
-		previewArgs
-	).pickableProperties
+	let pickableProperties: Record<string, any> = {}
+
+	$: {
+		const propPicker = getStepPropPicker(
+			$flowStateStore,
+			parentModule,
+			flowModule.id,
+			$flowStore,
+			previewArgs
+		).pickableProperties
+		propPicker['result'] = propPicker['previous_result']
+		delete propPicker['previous_result']
+		pickableProperties = propPicker
+	}
 </script>
 
 <div class="flex flex-col items-start space-y-2 {$$props.class}">
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
index 4fdc818a77..49d8cf8934 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -33,9 +33,9 @@
 	{#if flowModule.value.type === 'forloopflow'}
 		<FlowLoop bind:mod={flowModule} {parentModule} {previousModuleId} />
 	{:else if flowModule.value.type === 'branchone'}
-		<FlowBranchesWrapper bind:flowModule {parentModule} {previousModuleId} />
+		<FlowBranchesWrapper bind:flowModule {parentModule} />
 	{:else if flowModule.value.type === 'branchall'}
-		<FlowBranchesWrapper bind:flowModule {parentModule} {previousModuleId} />
+		<FlowBranchesWrapper bind:flowModule {parentModule} />
 	{:else if flowModule.value.type === 'identity'}
 		<FlowInputs
 			shouldDisableTriggerScripts={parentModule !== undefined || previousModuleId !== undefined}