diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index e717de868..668b6e763 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -142,7 +142,7 @@
                 if (rule.t == "btwn") {
                     btwnValueField.val(rule.v);
                     btwnValue2Field.val(rule.v2);
-                } else if (rule.v) {
+                } else if (typeof rule.v != "undefined") {
                     valueField.val(rule.v);
                 }
                 selectField.change();
diff --git a/nodes/core/logic/10-switch.js b/nodes/core/logic/10-switch.js
index 2804b14e5..e054d2464 100644
--- a/nodes/core/logic/10-switch.js
+++ b/nodes/core/logic/10-switch.js
@@ -48,7 +48,7 @@ function SwitchNode(n) {
             rule.v2 = Number(rule.v2);
         }
     }
-        
+
     this.on('input', function (msg) {
         var onward = [];
         var prop = propertyParts.reduce(function (obj, i) {