diff --git a/package-lock.json b/package-lock.json
index eb33b332..1756d2e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.0.0-next.13",
+  "version": "10.0.0-next.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "react-flow-renderer",
-      "version": "10.0.0-next.13",
+      "version": "10.0.0-next.14",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.15.4",
diff --git a/package.json b/package.json
index fbafd4e1..b2fdbe7a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.0.0-next.13",
+  "version": "10.0.0-next.14",
   "engines": {
     "node": ">=12"
   },
diff --git a/src/store/utils.ts b/src/store/utils.ts
index 6f34e2cb..be01a1b0 100644
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@@ -36,6 +36,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
   const parentNodes: ParentNodes = {};
 
   nodes.forEach((node) => {
+    const z = node.zIndex ? node.zIndex : node.dragging || node.selected ? 1000 : 0;
     const internals: NodeInternalsItem = {
       ...nodeInternals.get(node.id),
       id: node.id,
@@ -43,7 +44,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
       height: node.height || null,
       position: node.position,
       positionAbsolute: node.position,
-      z: node.dragging || node.selected ? 1000 : node.zIndex || 0,
+      z,
     };
     if (node.parentNode) {
       internals.parentNode = node.parentNode;
@@ -59,7 +60,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
       let startingZ = updatedInternals.z || 0;
 
       if (!startingZ) {
-        if (parentNodes[node.id] && node.parentNode) {
+        if (parentNodes[node.id]) {
           startingZ = 2;
         } else if (node.parentNode) {
           startingZ = 1;