diff --git a/src/components/ha-markdown.js b/src/components/ha-markdown.js
index a23ab70728..95152f6082 100644
--- a/src/components/ha-markdown.js
+++ b/src/components/ha-markdown.js
@@ -26,7 +26,11 @@ class HaMarkdown extends EventsMixin(PolymerElement) {
       loaded = import(/* webpackChunkName: "load_markdown" */ '../resources/load_markdown.js');
     }
     loaded.then(
-      () => { this._scriptLoaded = 1; },
+      ({ marked, filterXSS }) => {
+        this.marked = marked;
+        this.filterXSS = filterXSS;
+        this._scriptLoaded = 1;
+      },
       () => { this._scriptLoaded = 2; },
     ).then(() => this._render());
   }
@@ -41,7 +45,7 @@ class HaMarkdown extends EventsMixin(PolymerElement) {
       this._renderScheduled = false;
 
       if (this._scriptLoaded === 1) {
-        this.innerHTML = window.filterXSS(window.marked(this.content, {
+        this.innerHTML = this.filterXSS(this.marked(this.content, {
           gfm: true,
           tables: true,
           breaks: true
diff --git a/src/resources/load_markdown.js b/src/resources/load_markdown.js
index a48e50b45d..b5221e8a22 100644
--- a/src/resources/load_markdown.js
+++ b/src/resources/load_markdown.js
@@ -1,5 +1,5 @@
-import marked from 'marked';
-import filterXSS from 'xss';
+import marked_ from 'marked';
+import filterXSS_ from 'xss';
 
-window.marked = marked;
-window.filterXSS = filterXSS;
+export const marked = marked_;
+export const filterXSS = filterXSS_;