diff --git a/packages/react/src/container/ReactFlow/index.tsx b/packages/react/src/container/ReactFlow/index.tsx
index abb0023f..b04f2955 100644
--- a/packages/react/src/container/ReactFlow/index.tsx
+++ b/packages/react/src/container/ReactFlow/index.tsx
@@ -127,8 +127,8 @@ function ReactFlow<NodeType extends Node = Node, EdgeType extends Edge = Edge>(
     attributionPosition,
     proOptions,
     defaultEdgeOptions,
-    elevateNodesOnSelect,
-    elevateEdgesOnSelect,
+    elevateNodesOnSelect = true,
+    elevateEdgesOnSelect = false,
     disableKeyboardA11y = false,
     autoPanOnConnect,
     autoPanOnNodeDrag,
@@ -148,7 +148,7 @@ function ReactFlow<NodeType extends Node = Node, EdgeType extends Edge = Edge>(
     debug,
     onScroll,
     ariaLabelConfig,
-    zIndexMode,
+    zIndexMode = 'basic',
     ...rest
   }: ReactFlowProps<NodeType, EdgeType>,
   ref: ForwardedRef<HTMLDivElement>
diff --git a/packages/react/src/store/initialState.ts b/packages/react/src/store/initialState.ts
index d90aa8b4..597b1147 100644
--- a/packages/react/src/store/initialState.ts
+++ b/packages/react/src/store/initialState.ts
@@ -59,7 +59,7 @@ const getInitialState = ({
   const nodesInitialized = adoptUserNodes(storeNodes, nodeLookup, parentLookup, {
     nodeOrigin: storeNodeOrigin,
     nodeExtent: storeNodeExtent,
-    elevateNodesOnSelect: false,
+    zIndexMode,
   });
 
   let transform: Transform = [0, 0, 1];
diff --git a/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte b/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
index ab9378b8..a2283be7 100644
--- a/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
+++ b/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
@@ -75,7 +75,7 @@
   }: SvelteFlowProps<NodeType, EdgeType> &
     Omit<HTMLAttributes<HTMLDivElement>, 'onselectionchange'> = $props();
 
-  // svelte-ignore non_reactive_update
+  // svelte-ignore non_reactive_update, state_referenced_locally
   let store = createStore<NodeType, EdgeType>({
     props,
     width,