diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 9508a0d28..7f2f22b5b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1895,7 +1895,7 @@ RED.nodes = (function() {
             newNode.changed = true;
         }
 
-        if (configNode.hasOwnProperty("d")) {
+        if (configNode.hasOwnProperty("d")) {   // Disabled
             newNode.d = configNode.d;
         }
 
@@ -1948,10 +1948,10 @@ RED.nodes = (function() {
             newNode.outputLabels = node.outputLabels;
             newNode.icon = node.icon;
         }
-        if (node.hasOwnProperty("l")) {
+        if (node.hasOwnProperty("l")) { // Label (show/hide)
             newNode.l = node.l;
         }
-        if (node.hasOwnProperty("d")) {
+        if (node.hasOwnProperty("d")) { // Disabled
             newNode.d = node.d;
         }
         if (node.hasOwnProperty("g")) { // Group
@@ -3045,7 +3045,13 @@ RED.nodes = (function() {
             removedNodes.push(convertNode(node));
 
             // Remove the Node
-            removeNode(node);
+            // NOTE: DON'T use removeNode - no need for everything that is done there.
+            // Just delete the node because we re-import it as is afterwards.
+            if (configNodes.hasOwnProperty(node.id)) {
+                delete configNodes[node.id];
+            } else {
+                allNodes.removeNode(node);
+            }
 
             // Reimporting a node *without* including its group object will cause
             // the g property to be cleared. Cache it here so we can restore it.