diff --git a/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js b/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js
index 0293c7f97..cbf9fc9d7 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js
@@ -165,7 +165,7 @@ function buildDiagnosticReport(scope, callback) {
 
     /** gets a sanitised list containing only the module name */
     function listContextModules() {
-        const keys = Object.keys(runtime.settings.contextStorage);
+        const keys = Object.keys(runtime.settings.contextStorage || {});
         const result = {};
         keys.forEach(e => {
             result[e] = {