diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchAllEndNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchAllEndNode.svelte
index 94faeefe64..230d04d4b3 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/BranchAllEndNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/BranchAllEndNode.svelte
@@ -2,14 +2,11 @@
 	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { BranchAllEndN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: BranchAllEndN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset} enableSourceHandle enableTargetHandle>
@@ -18,7 +15,7 @@
 			label={'Collect result from all branches'}
 			id={data.id}
 			selectable={true}
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			on:select={(e) => {
 				data?.eventHandlers?.select(e.detail)
 			}}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
index 5225dfec45..b59805a871 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
@@ -5,14 +5,11 @@
 	import NodeWrapper from './NodeWrapper.svelte'
 	import { X } from 'lucide-svelte'
 	import type { BranchAllStartN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: BranchAllStartN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset}>
@@ -20,7 +17,7 @@
 		<VirtualItem
 			label={data.label}
 			selectable
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			on:select={() => {
 				setTimeout(() => data.eventHandlers.select(data.id))
 			}}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
index cef6e3345b..c5c259b4a8 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
@@ -5,14 +5,11 @@
 	import NodeWrapper from './NodeWrapper.svelte'
 	import { X } from 'lucide-svelte'
 	import type { BranchOneStartN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: BranchOneStartN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset}>
@@ -21,7 +18,7 @@
 			label={data.label}
 			preLabel={data.preLabel}
 			selectable
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			on:select={() => {
 				setTimeout(() => data?.eventHandlers?.select(data.id))
 			}}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
index 143089f85a..379d75a6ba 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ForLoopEndNode.svelte
@@ -2,14 +2,11 @@
 	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { ForLoopEndN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: ForLoopEndN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset}>
@@ -18,7 +15,7 @@
 			<VirtualItem
 				label={'Each event is processed'}
 				selectable={false}
-				selected={selectionManager?.isNodeSelected(data.id)}
+				selected={false}
 				id={data.id}
 				hideId
 				on:select={(e) => {
@@ -29,7 +26,7 @@
 			<VirtualItem
 				label={'Collect result of each iteration'}
 				selectable={true}
-				selected={selectionManager?.isNodeSelected(data.id)}
+				selected={false}
 				id={data.id}
 				on:select={(e) => {
 					setTimeout(() => data?.eventHandlers?.select(e.detail))
diff --git a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
index b53e06a593..70b900957e 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/ForLoopStartNode.svelte
@@ -5,7 +5,6 @@
 	import { getContext } from 'svelte'
 	import type { PropPickerContext } from '$lib/components/prop_picker'
 	import type { ForLoopStartN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: ForLoopStartN['data']
 	}
@@ -51,8 +50,6 @@
 		return 'none'
 	}
 	let filteredInput = $derived(filterIterFromInput($pickablePropertiesFiltered?.flow_input))
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset}>
@@ -60,7 +57,7 @@
 		<VirtualItem
 			label={data.simplifiedTriggerView ? 'For each new event' : 'Do one iteration'}
 			selectable={false}
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			id={data.id}
 			hideId
 			on:select={(e) => {
diff --git a/frontend/src/lib/components/graph/renderers/nodes/NoBranchNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/NoBranchNode.svelte
index 555e0f4431..356e1c272a 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/NoBranchNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/NoBranchNode.svelte
@@ -2,14 +2,11 @@
 	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { NoBranchN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: NoBranchN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset} enableSourceHandle enableTargetHandle>
@@ -19,7 +16,7 @@
 			id={data.id}
 			hideId={true}
 			selectable={true}
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			on:select={(e) => {
 				setTimeout(() => data?.eventHandlers?.select(e.detail))
 			}}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
index a2cb550437..88a4985b8c 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/branchOneEndNode.svelte
@@ -2,14 +2,11 @@
 	import VirtualItem from '$lib/components/flows/map/VirtualItem.svelte'
 	import NodeWrapper from './NodeWrapper.svelte'
 	import type { BranchOneEndN } from '../../graphBuilder.svelte'
-	import { getGraphContext } from '../../graphContext'
 	interface Props {
 		data: BranchOneEndN['data']
 	}
 
 	let { data }: Props = $props()
-
-	const { selectionManager } = getGraphContext()
 </script>
 
 <NodeWrapper offset={data.offset}>
@@ -18,7 +15,7 @@
 			label={'Collect result from chosen branch'}
 			id={data.id}
 			selectable={true}
-			selected={selectionManager?.isNodeSelected(data.id)}
+			selected={false}
 			on:select={(e) => {
 				setTimeout(() => data?.eventHandlers?.select(e.detail))
 			}}
diff --git a/frontend/src/lib/components/graph/selectionUtils.svelte.ts b/frontend/src/lib/components/graph/selectionUtils.svelte.ts
index feb6487583..ce22d47e29 100644
--- a/frontend/src/lib/components/graph/selectionUtils.svelte.ts
+++ b/frontend/src/lib/components/graph/selectionUtils.svelte.ts
@@ -170,11 +170,6 @@ export class SelectionManager {
 		return [...this.selectedIds]
 	}
 
-	// Get primary selected node ID (for backwards compatibility)
-	get primarySelectedId(): string | undefined {
-		return this.getSelectedId()
-	}
-
 	// Handle keyboard shortcuts
 	handleKeyDown(event: KeyboardEvent, nodes?: Node[]) {
 		if (event.key === 'Escape') {