diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 346b991b2..a8b2859bc 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -23,7 +23,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-scroller/emby-scroller';
 import '../../assets/css/flexstyles.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 function showViewSettings(instance) {
     import('./guide-settings').then((guideSettingsDialog) => {
diff --git a/src/elements/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js
index 4ecfb5b7c..c5cf56468 100644
--- a/src/elements/emby-button/paper-icon-button-light.js
+++ b/src/elements/emby-button/paper-icon-button-light.js
@@ -1,6 +1,6 @@
 import layoutManager from '../../components/layoutManager';
 import './emby-button.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
 
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index a03b23843..0af079ec0 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -1,7 +1,7 @@
 import browser from '../../scripts/browser';
 import dom from '../../scripts/dom';
 import './emby-checkbox.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index 711e67920..3cec3507c 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -1,5 +1,5 @@
 import './emby-collapse';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import '../../elements/emby-button/emby-button';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index 713559bca..60f459f32 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/src/elements/emby-input/emby-input.js
@@ -1,7 +1,7 @@
 import browser from '../../scripts/browser';
 import dom from '../../scripts/dom';
 import './emby-input.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
index cb00c041d..c3a15ce12 100644
--- a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
+++ b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
@@ -2,7 +2,7 @@ import EmbyProgressRing from '../emby-progressring/emby-progressring';
 import dom from '../../scripts/dom';
 import serverNotifications from '../../scripts/serverNotifications';
 import { Events } from 'jellyfin-apiclient';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index b598c8a84..07e7d651b 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -10,7 +10,7 @@ import loading from '../../components/loading/loading';
 import focusManager from '../../components/focusManager';
 import serverNotifications from '../../scripts/serverNotifications';
 import { ConnectionManager, Events } from 'jellyfin-apiclient';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js
index 83b49b7ba..a95956572 100644
--- a/src/elements/emby-progressring/emby-progressring.js
+++ b/src/elements/emby-progressring/emby-progressring.js
@@ -1,5 +1,5 @@
 import './emby-progressring';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index f2b7fdf81..46cf4989d 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -1,6 +1,6 @@
 import layoutManager from '../../components/layoutManager';
 import browser from '../../scripts/browser';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import './emby-radio.css';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index ad4f59106..e85b42691 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
@@ -1,5 +1,5 @@
 import './emby-scrollbuttons';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import '../../elements/emby-button/paper-icon-button-light';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js
index 9bdbc6c8e..037b8faac 100644
--- a/src/elements/emby-scroller/emby-scroller.js
+++ b/src/elements/emby-scroller/emby-scroller.js
@@ -4,7 +4,7 @@ import layoutManager from '../../components/layoutManager';
 import inputManager from '../../scripts/inputManager';
 import focusManager from '../../components/focusManager';
 import browser from '../../scripts/browser';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import './emby-scroller.css';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index b75045b8d..f3d38fd31 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -3,7 +3,7 @@ import layoutManager from '../../components/layoutManager';
 import browser from '../../scripts/browser';
 import actionsheet from '../../components/actionSheet/actionSheet';
 import './emby-select.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index 943fbeeeb..a38045694 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -3,7 +3,7 @@ import dom from '../../scripts/dom';
 import layoutManager from '../../components/layoutManager';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
 import './emby-slider.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import '../emby-input/emby-input';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index 51144c7d3..9b7dd794d 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/src/elements/emby-tabs/emby-tabs.js
@@ -2,7 +2,7 @@ import dom from '../../scripts/dom';
 import scroller from '../../libraries/scroller';
 import browser from '../../scripts/browser';
 import focusManager from '../../components/focusManager';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import './emby-tabs.css';
 import '../../assets/css/scrollstyles.css';
 
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index 63a932b6c..18158d870 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -1,5 +1,5 @@
 import './emby-textarea.css';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 import '../emby-input/emby-input';
 
 /* eslint-disable indent */
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index f359f25cc..e0bfdab4a 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/src/elements/emby-toggle/emby-toggle.js
@@ -1,5 +1,5 @@
 import './emby-toggle';
-import 'webcomponents.js';
+import 'webcomponents.js/webcomponents-lite';
 
 /* eslint-disable indent */
 
diff --git a/src/scripts/site.js b/src/scripts/site.js
index f03c38d7b..c0fedd3eb 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -7,7 +7,6 @@ import 'classlist.js';
 import 'whatwg-fetch';
 import 'resize-observer-polyfill';
 import 'jellyfin-noto';
-import 'webcomponents.js';
 import '../assets/css/site.css';
 
 // TODO: Move this elsewhere