diff --git a/panels/automation/ha-panel-automation.html b/panels/automation/ha-panel-automation.html
index e5a097e6f0..e565ef2b9c 100644
--- a/panels/automation/ha-panel-automation.html
+++ b/panels/automation/ha-panel-automation.html
@@ -103,7 +103,7 @@ Polymer({
   },
 
   computeAutomation: function (automations, automationId, creatingNew) {
-    if (creatingNew) {
+    if (creatingNew || !automations) {
       return null;
     }
     for (var i = 0; i < automations.length; i++) {
diff --git a/panels/hassio/dashboard/hassio-hass-info.html b/panels/hassio/dashboard/hassio-hass-info.html
index c6dcb762c2..af18bf7c22 100644
--- a/panels/hassio/dashboard/hassio-hass-info.html
+++ b/panels/hassio/dashboard/hassio-hass-info.html
@@ -5,23 +5,24 @@
 <link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
 
 <dom-module id="hassio-hass-info">
-  <style include="iron-flex ha-style">
-    paper-card {
-      display: block;
-      height: 100%;
-    }
-    .info {
-      width: 100%;
-    }
-    .info td:nth-child(2) {
-      text-align: right;
-    }
-    .errors {
-      color: var(--google-red-500);
-      margin-top: 16px;
-    }
-  </style>
   <template>
+    <style include="iron-flex ha-style">
+      paper-card {
+        display: block;
+        height: 100%;
+      }
+      .info {
+        width: 100%;
+      }
+      .info td:nth-child(2) {
+        text-align: right;
+      }
+      .errors {
+        color: var(--google-red-500);
+        margin-top: 16px;
+      }
+    </style>
+
     <paper-card heading="Home Assistant">
       <div class="card-content">
         <table class='info'>
diff --git a/panels/hassio/dashboard/hassio-host-info.html b/panels/hassio/dashboard/hassio-host-info.html
index 5f0e422161..7baef7a9e2 100644
--- a/panels/hassio/dashboard/hassio-host-info.html
+++ b/panels/hassio/dashboard/hassio-host-info.html
@@ -4,23 +4,23 @@
 <link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
 <dom-module id="hassio-host-info">
-  <style include="iron-flex ha-style">
-    paper-card {
-      display: block;
-      height: 100%;
-    }
-    .info {
-      width: 100%;
-    }
-    .info td:nth-child(2) {
-      text-align: right;
-    }
-    .errors {
-      color: var(--google-red-500);
-      margin-top: 16px;
-    }
-  </style>
   <template>
+    <style include="iron-flex ha-style">
+      paper-card {
+        display: block;
+        height: 100%;
+      }
+      .info {
+        width: 100%;
+      }
+      .info td:nth-child(2) {
+        text-align: right;
+      }
+      .errors {
+        color: var(--google-red-500);
+        margin-top: 16px;
+      }
+    </style>
     <paper-card heading="Host OS">
       <div class="card-content">
         <table class='info'>
diff --git a/panels/hassio/dashboard/hassio-supervisor-info.html b/panels/hassio/dashboard/hassio-supervisor-info.html
index 3277d9d551..8ec55890b8 100644
--- a/panels/hassio/dashboard/hassio-supervisor-info.html
+++ b/panels/hassio/dashboard/hassio-supervisor-info.html
@@ -4,23 +4,23 @@
 <link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
 <dom-module id="hassio-supervisor-info">
-  <style include="iron-flex ha-style">
-    paper-card {
-      display: block;
-      height: 100%;
-    }
-    .info {
-      width: 100%;
-    }
-    .info td:nth-child(2) {
-      text-align: right;
-    }
-    .errors {
-      color: var(--google-red-500);
-      margin-top: 16px;
-    }
-  </style>
   <template>
+    <style include="iron-flex ha-style">
+      paper-card {
+        display: block;
+        height: 100%;
+      }
+      .info {
+        width: 100%;
+      }
+      .info td:nth-child(2) {
+        text-align: right;
+      }
+      .errors {
+        color: var(--google-red-500);
+        margin-top: 16px;
+      }
+    </style>
     <paper-card heading="Supervisor">
       <div class="card-content">
         <table class='info'>