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 7f7778ee8..236f7fa57 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
@@ -852,6 +852,7 @@ RED.nodes = (function() {
                     RED.nodes.eachConfig(function(n) {
                         if (n.z == subflowId) {
                             subflowSet.push(n);
+                            exportedConfigNodes[n.id] = true;
                         }
                     });
                     var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
@@ -859,37 +860,35 @@ RED.nodes = (function() {
                 }
             }
             if (node.type !== "subflow") {
-                if (nns.findIndex((v) => v && v.id === node.id) == -1) {
-                    var convertedNode = RED.nodes.convertNode(node);
-                    for (var d in node._def.defaults) {
-                        if (node._def.defaults[d].type) {
-                            var nodeList = node[d];
-                            if (!Array.isArray(nodeList)) {
-                                nodeList = [nodeList];
-                            }
-                            nodeList = nodeList.filter(function(id) {
-                                if (id in configNodes) {
-                                    var confNode = configNodes[id];
-                                    if (confNode._def.exportable !== false) {
-                                        if (!(id in exportedConfigNodes)) {
-                                            exportedConfigNodes[id] = true;
-                                            set.push(confNode);
-                                            return true;
-                                        }
+                var convertedNode = RED.nodes.convertNode(node);
+                for (var d in node._def.defaults) {
+                    if (node._def.defaults[d].type) {
+                        var nodeList = node[d];
+                        if (!Array.isArray(nodeList)) {
+                            nodeList = [nodeList];
+                        }
+                        nodeList = nodeList.filter(function(id) {
+                            if (id in configNodes) {
+                                var confNode = configNodes[id];
+                                if (confNode._def.exportable !== false) {
+                                    if (!(id in exportedConfigNodes)) {
+                                        exportedConfigNodes[id] = true;
+                                        set.push(confNode);
+                                        return true;
                                     }
-                                    return false;
                                 }
-                                return true;
-                            })
-                            if (nodeList.length === 0) {
-                                convertedNode[d] = Array.isArray(node[d])?[]:""
-                            } else {
-                                convertedNode[d] = Array.isArray(node[d])?nodeList:nodeList[0]
+                                return false;
                             }
+                            return true;
+                        })
+                        if (nodeList.length === 0) {
+                            convertedNode[d] = Array.isArray(node[d])?[]:""
+                        } else {
+                            convertedNode[d] = Array.isArray(node[d])?nodeList:nodeList[0]
                         }
                     }
-                    nns.push(convertedNode);
                 }
+                nns.push(convertedNode);
                 if (node.type === "group") {
                     nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
                 }