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 67d3aa616..5d65befd3 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
@@ -1377,10 +1377,6 @@ RED.nodes = (function() {
                     return (otherNode && otherNode.z === activeWorkspace)
                 });
             }
-
-            // With all properties now remapped to point at valid nodes,
-            // we can validate the node
-            RED.editor.validateNode(n);
         }
         for (i=0;i<new_subflows.length;i++) {
             n = new_subflows[i];
@@ -1435,6 +1431,12 @@ RED.nodes = (function() {
         for (i=0;i<new_nodes.length;i++) {
             var node = new_nodes[i];
             addNode(node);
+        }
+        // Finally validate them all.
+        // This has to be done after everything is added so that any checks for
+        // dependent config nodes will pass
+        for (i=0;i<new_nodes.length;i++) {
+            var node = new_nodes[i];
             RED.editor.validateNode(node);
         }