diff --git a/src/scripts/clientUtils.js b/src/scripts/clientUtils.js
index 694b889457..f5e41887bf 100644
--- a/src/scripts/clientUtils.js
+++ b/src/scripts/clientUtils.js
@@ -10,7 +10,6 @@ import datetime from '../scripts/datetime';
 import { DirectoryBrowser } from '../components/directorybrowser/directorybrowser';
 import dialogHelper from '../components/dialogHelper/dialogHelper';
 import itemIdentifier from '../components/itemidentifier/itemidentifier';
-import { Events } from 'jellyfin-apiclient';
 
 export function getCurrentUser() {
     return window.ApiClient.getCurrentUser(false);
@@ -224,7 +223,6 @@ const Dashboard = {
     serverAddress,
     showLoadingMsg,
     datetime,
-    Events,
     DirectoryBrowser,
     dialogHelper,
     itemIdentifier
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 2b8e110d32..b55fdb80b2 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -36,6 +36,7 @@ import { playbackManager } from '../components/playback/playbackmanager';
 import SyncPlayNoActivePlayer from '../components/syncPlay/ui/players/NoActivePlayer';
 import SyncPlayHtmlVideoPlayer from '../components/syncPlay/ui/players/HtmlVideoPlayer';
 import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudioPlayer';
+import taskButton from '../scripts/taskbutton';
 
 // TODO: Move this elsewhere
 window.getWindowLocationSearch = function(win) {
@@ -82,6 +83,10 @@ function loadCoreDictionary() {
 }
 
 function init() {
+    // This is used in plugins
+    window.events = Events;
+    window.TaskButton = taskButton;
+
     serverAddress().then(server => {
         if (server) {
             ServerConnections.initApiClient(server);
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index 05a8010662..7e80760898 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -121,5 +121,4 @@ function taskbutton(options) {
     }
 }
 
-window.TaskButton = taskbutton;
 export default taskbutton;