diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
index 30b2ccdb0..356d5734e 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
@@ -239,7 +239,16 @@ var api = module.exports = {
                     throw error;
                 }
             } else {
-                credentialCache = credentials;
+                if (encryptionEnabled) {
+                    // Our config expects the credentials to be encrypted but the encrypted object is not found
+                    var error = new Error("Encrypted credentials not found");
+                    error.code = "credentials_load_failed";
+                    throw error
+                } else {
+                    // credentialSecret is set to False
+                    log.warn("Using Unecrypted credentials")
+                    credentialCache = credentials;
+                }
             }
             if (clearInvalidFlag) {
                 // TODO: this delves too deep into Project structure