diff --git a/packages/react/src/store/initialState.ts b/packages/react/src/store/initialState.ts
index 597b1147..26a5c045 100644
--- a/packages/react/src/store/initialState.ts
+++ b/packages/react/src/store/initialState.ts
@@ -29,7 +29,7 @@ const getInitialState = ({
   maxZoom = 2,
   nodeOrigin,
   nodeExtent,
-  zIndexMode = 'auto',
+  zIndexMode = 'basic',
 }: {
   nodes?: Node[];
   edges?: Edge[];
diff --git a/packages/react/src/types/component-props.ts b/packages/react/src/types/component-props.ts
index aad916a1..effc7ca6 100644
--- a/packages/react/src/types/component-props.ts
+++ b/packages/react/src/types/component-props.ts
@@ -696,7 +696,7 @@ export interface ReactFlowProps<NodeType extends Node = Node, EdgeType extends E
    * Used to define how z-indexing is calculated for nodes and edges.
    * 'auto' is for selections and sub flows, 'basic' for selections only, and 'manual' for no auto z-indexing.
    *
-   * @default 'auto'
+   * @default 'basic'
    */
   zIndexMode?: ZIndexMode;
 }
diff --git a/packages/svelte/src/lib/container/SvelteFlow/types.ts b/packages/svelte/src/lib/container/SvelteFlow/types.ts
index bcba8961..8e5c6c8c 100644
--- a/packages/svelte/src/lib/container/SvelteFlow/types.ts
+++ b/packages/svelte/src/lib/container/SvelteFlow/types.ts
@@ -505,7 +505,7 @@ export type SvelteFlowProps<
      * Used to define how z-indexing is calculated for nodes and edges.
      * 'auto' is for selections and sub flows, 'basic' for selections only, and 'manual' for no auto z-indexing.
      *
-     * @default 'auto'
+     * @default 'basic'
      */
     zIndexMode?: ZIndexMode;
   };
diff --git a/packages/svelte/src/lib/store/initial-store.svelte.ts b/packages/svelte/src/lib/store/initial-store.svelte.ts
index f6554fd9..fb7dfc99 100644
--- a/packages/svelte/src/lib/store/initial-store.svelte.ts
+++ b/packages/svelte/src/lib/store/initial-store.svelte.ts
@@ -117,7 +117,7 @@ export function getInitialStore<NodeType extends Node = Node, EdgeType extends E
     panZoom: PanZoomInstance | null = $state.raw(null);
     width = $state.raw<number>(signals.width ?? 0);
     height = $state.raw<number>(signals.height ?? 0);
-    zIndexMode = $state.raw<ZIndexMode>(signals.props.zIndexMode ?? 'auto');
+    zIndexMode = $state.raw<ZIndexMode>(signals.props.zIndexMode ?? 'basic');
 
     nodesInitialized: boolean = $derived.by(() => {
       const nodesInitialized = adoptUserNodes(signals.nodes, this.nodeLookup, this.parentLookup, {
diff --git a/packages/system/src/types/general.ts b/packages/system/src/types/general.ts
index 7af07063..d2939f82 100644
--- a/packages/system/src/types/general.ts
+++ b/packages/system/src/types/general.ts
@@ -375,6 +375,5 @@ export type OnBeforeDeleteBase<NodeType extends NodeBase = NodeBase, EdgeType ex
  * `manual` mode does not apply any automatic z-indexing.
  *
  * @public
- * @default 'auto'
  */
 export type ZIndexMode = 'auto' | 'basic' | 'manual';
diff --git a/packages/system/src/utils/edges/general.ts b/packages/system/src/utils/edges/general.ts
index f380b270..25719c3d 100644
--- a/packages/system/src/utils/edges/general.ts
+++ b/packages/system/src/utils/edges/general.ts
@@ -51,7 +51,7 @@ export function getElevatedEdgeZIndex({
   selected = false,
   zIndex,
   elevateOnSelect = false,
-  zIndexMode = 'auto',
+  zIndexMode = 'basic',
 }: GetEdgeZIndexParams): number {
   const manualZIndexMode = isManualZIndexMode(zIndexMode);
 
diff --git a/packages/system/src/utils/store.ts b/packages/system/src/utils/store.ts
index de75804f..b499dfee 100644
--- a/packages/system/src/utils/store.ts
+++ b/packages/system/src/utils/store.ts
@@ -37,7 +37,7 @@ const defaultOptions = {
   nodeOrigin: [0, 0] as NodeOrigin,
   nodeExtent: infiniteExtent,
   elevateNodesOnSelect: true,
-  zIndexMode: 'auto' as ZIndexMode,
+  zIndexMode: 'basic' as ZIndexMode,
   defaults: {},
 };