diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
index 95071731d..aa1972221 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
@@ -217,6 +217,10 @@ module.exports = function(RED) {
 
     function applyRules(node, msg, property,state,done) {
         if (!state) {
+            if (node.rules.length === 0) {
+                done(undefined, []);
+                return;
+            }
             state = {
                 currentRule: 0,
                 elseflag: true,