diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 8c9b953d39..dc5c5a739b 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -1,6 +1,7 @@
 define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
     'use strict';
 
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     var appRouter = {
diff --git a/src/components/apphost.js b/src/components/apphost.js
index 8a5581d817..360f01c915 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -1,6 +1,8 @@
 define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'globalize'], function (appSettings, browser, events, htmlMediaHelper, webSettings, globalize) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function getBaseProfileOptions(item) {
         var disableHlsVideoAudioCodecs = [];
 
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index abc7d81fee..cf0ff7fb9c 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -1,6 +1,7 @@
 define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
     'use strict';
 
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     function showViewSettings(instance) {
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 166ebb2245..46e2dae999 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -19,8 +19,6 @@ import 'css!./imageeditor';
 
     const enableFocusTransform = !browser.slow && !browser.edge;
 
-    loading = loading.default || loading;
-
     let currentItem;
     let hasChanges = false;
 
diff --git a/src/components/layoutManager.js b/src/components/layoutManager.js
index bec7d4ae3b..85d78f8ff4 100644
--- a/src/components/layoutManager.js
+++ b/src/components/layoutManager.js
@@ -1,6 +1,8 @@
 define(['browser', 'appSettings', 'events'], function (browser, appSettings, events) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function setLayout(instance, layout, selectedLayout) {
         if (layout === selectedLayout) {
             instance[layout] = true;
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index faa1a1f306..f27d1fc3d2 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -1,6 +1,8 @@
 define(['apphost', 'userSettings', 'browser', 'events', 'backdrop', 'globalize', 'require', 'appSettings'], function (appHost, userSettings, browser, events, backdrop, globalize, require, appSettings) {
     'use strict';
 
+    browser = browser.default || browser;
+
     var themeStyleElement;
     var currentThemeId;
 
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 56327312f6..60c458e234 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -5,6 +5,8 @@
 define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'dom', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost, dom) {
     'use strict';
 
+    browser = browser.default || browser;
+
     /**
      * Name of transition event.
      */
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index de5c4cf186..5bc9386053 100644
--- a/src/components/tunerPicker.js
+++ b/src/components/tunerPicker.js
@@ -1,6 +1,7 @@
 define(['dialogHelper', 'dom', 'layoutManager', 'connectionManager', 'globalize', 'loading', 'browser', 'focusManager', 'scrollHelper', 'material-icons', 'formDialogStyle', 'emby-button', 'emby-itemscontainer', 'cardStyle'], function (dialogHelper, dom, layoutManager, connectionManager, globalize, loading, browser, focusManager, scrollHelper) {
     'use strict';
 
+    browser = browser.default || browser;
     loading = loading.default || loading;
 
     var enableFocusTransform = !browser.slow && !browser.edge;
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index c65ce39d84..df2855d69a 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -29,8 +29,6 @@ import 'emby-select';
 
 /* eslint-disable indent */
 
-    loading = loading.default || loading;
-
     function getPromise(apiClient, params) {
         const id = params.id;
 
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index 8c296cdd3c..29ec4a10a5 100644
--- a/src/controllers/livetvsettings.js
+++ b/src/controllers/livetvsettings.js
@@ -3,8 +3,6 @@ import loading from 'loading';
 import globalize from 'globalize';
 import 'emby-button';
 
-loading = loading.default || loading;
-
 function loadPage(page, config) {
     $('.liveTvSettingsForm', page).show();
     $('.noLiveTvServices', page).hide();
diff --git a/src/libraries/navdrawer/navdrawer.js b/src/libraries/navdrawer/navdrawer.js
index d9c246b406..4733c617f3 100644
--- a/src/libraries/navdrawer/navdrawer.js
+++ b/src/libraries/navdrawer/navdrawer.js
@@ -1,6 +1,8 @@
 define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function (browser, dom) {
     "use strict";
 
+    browser = browser.default || browser;
+
     return function (options) {
         function getTouches(e) {
             return e.changedTouches || e.targetTouches || e.touches;
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index 645a8ea85c..c0cb3e557c 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -1,6 +1,8 @@
 define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'scrollStyles'], function (browser, layoutManager, dom, focusManager, ResizeObserver) {
     'use strict';
 
+    browser = browser.default || browser;
+
     /**
 * Return type of the value.
 *
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index 382ffbed1a..5befcb1df5 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -1,6 +1,8 @@
 define(['browser'], function (browser) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function canPlayH264(videoTestElement) {
         return !!(videoTestElement.canPlayType && videoTestElement.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
     }
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index d2a68cd6e3..e47b277756 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -1,6 +1,8 @@
 define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', 'viewManager', 'libraryBrowser', 'appRouter', 'apphost', 'playbackManager', 'syncPlayManager', 'groupSelectionMenu', 'browser', 'globalize', 'scripts/imagehelper', 'paper-icon-button-light', 'material-icons', 'scrollStyles', 'flexStyles'], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, syncPlayManager, groupSelectionMenu, browser, globalize, imageHelper) {
     'use strict';
 
+    browser = browser.default || browser;
+
     function renderHeader() {
         var html = '';
         html += '<div class="flex align-items-center flex-grow headerTop">';
diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js
index d801d82393..45ac36fe36 100644
--- a/src/scripts/mouseManager.js
+++ b/src/scripts/mouseManager.js
@@ -1,6 +1,8 @@
 define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'dom'], function (inputManager, focusManager, browser, layoutManager, events, dom) {
     'use strict';
 
+    browser = browser.default || browser;
+
     var self = {};
 
     var lastMouseInputTime = new Date().getTime();