diff --git a/panels/automation/ha-automation-editor.html b/panels/automation/ha-automation-editor.html
index 3a05ded576..cf7fb1b356 100644
--- a/panels/automation/ha-automation-editor.html
+++ b/panels/automation/ha-automation-editor.html
@@ -163,8 +163,9 @@ Polymer({
         // Normalize data: ensure trigger, action and condition are lists
         // Happens when people copy paste their automations into the config
         ['trigger', 'condition', 'action'].forEach(function (key) {
-          if (!Array.isArray(config[key])) {
-            config[key] = [config[key]];
+          var value = config[key];
+          if (value && !Array.isArray(value)) {
+            config[key] = [value];
           }
         });
         this.dirty = false;