diff --git a/src/entrypoints/app.ts b/src/entrypoints/app.ts
index 9be05793acfa..1e31a4fc5b77 100644
--- a/src/entrypoints/app.ts
+++ b/src/entrypoints/app.ts
@@ -1,9 +1,6 @@
-// Load polyfill first so HTML imports start resolving
-/* eslint-disable import/first */
 import "@polymer/paper-styles/typography";
 import { setPassiveTouchGestures } from "@polymer/polymer/lib/utils/settings";
 import "../layouts/home-assistant";
-import "../resources/html-import/polyfill";
 import "../resources/roboto";
 import "../util/legacy-support";
 
@@ -12,3 +9,5 @@ setPassiveTouchGestures(true);
 document.createElement = Document.prototype.createElement;
 
 (window as any).frontendVersion = __VERSION__;
+
+import("../resources/html-import/polyfill");