diff --git a/red/nodes.js b/red/nodes.js
index f4e3df7d4..8c14fdfe2 100644
--- a/red/nodes.js
+++ b/red/nodes.js
@@ -207,6 +207,10 @@ var credentials = {};
 
 module.exports.addCredentials = function(id,creds) {
     credentials[id] = creds;
+    if (!storage) {
+        // Do this lazily to ensure the storage provider as been initialised
+        storage = require("./storage");
+    }
     storage.saveCredentials(credentials);
 }
 module.exports.getCredentials = function(id) {