diff --git a/src/modules/canary-card.js b/src/modules/canary-card.js
index 90fa5ba8..63a08965 100644
--- a/src/modules/canary-card.js
+++ b/src/modules/canary-card.js
@@ -1,4 +1,4 @@
-import { html, LitElement } from "card-tools/src/lit-element";
+import { LitElement } from "card-tools/src/lit-element";
 import { createCard } from "card-tools/src/lovelace-element";
 import { hass } from "card-tools/src/hass";
 import { applyTheme } from "../styles";
@@ -13,12 +13,7 @@ class CanaryCard extends LitElement {
   }
 
   render() {
-    return html`
-      ${this._card}
-      <style>
-        ${this._config.style}
-      </style>
-    `;
+    return this._card;
   }
 
   setConfig(config) {
@@ -27,6 +22,19 @@ class CanaryCard extends LitElement {
     this._hass = this._card.hass = hass();
   }
 
+  firstUpdated() {
+    if (typeof this._config.style === "object") {
+      Object.assign(this._card.style, this._config.style);
+    } else {
+      let styleEl = document.createElement("style");
+      styleEl.innerHTML = this._config.style;
+
+      this._card.updateComplete.then(() => {
+        (this._card.shadowRoot || this._card).appendChild(styleEl);
+      });
+    }
+  }
+
   set hass(hass) {
     this._hass = hass;
     this._card.hass = hass;