diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index d125156ab..27783be7f 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -143,6 +143,12 @@ function loadModuleFiles(modules) {
         return loadNodeSetList(pluginList);
     }).then(function() {
         return loadNodeSetList(nodeList);
+    }).then(function () {
+        if (settings.available()) {
+            return registry.saveNodeList();
+        } else {
+            return
+        }
     })
 }
 
@@ -436,7 +442,7 @@ async function loadPlugin(plugin) {
         return plugin;
     }
 }
-
+let invocation = 0
 function loadNodeSetList(nodes) {
     var promises = [];
     nodes.forEach(function(node) {
@@ -451,13 +457,7 @@ function loadNodeSetList(nodes) {
         }
     });
 
-    return Promise.all(promises).then(function() {
-        if (settings.available()) {
-            return registry.saveNodeList();
-        } else {
-            return;
-        }
-    });
+    return Promise.all(promises)
 }
 
 function addModule(module) {