diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py
index 884f4bef..73290ccf 100644
--- a/src/Ui/UiRequest.py
+++ b/src/Ui/UiRequest.py
@@ -605,7 +605,9 @@ class UiRequest(object):
                     return self.error403()
                 ui_websocket = UiWebsocket(ws, site, self.server, user, self)
                 site.websockets.append(ui_websocket)  # Add to site websockets to allow notify on events
+                self.server.websockets.append(ui_websocket)
                 ui_websocket.start()
+                self.server.websockets.remove(ui_websocket)
                 for site_check in self.server.sites.values():
                     # Remove websocket from every site (admin sites allowed to join other sites event channels)
                     if ui_websocket in site_check.websockets:
diff --git a/src/Ui/UiServer.py b/src/Ui/UiServer.py
index 926f1fea..c236f8ae 100644
--- a/src/Ui/UiServer.py
+++ b/src/Ui/UiServer.py
@@ -70,6 +70,7 @@ class UiServer:
 
         self.wrapper_nonces = []
         self.add_nonces = []
+        self.websockets = []
         self.site_manager = SiteManager.site_manager
         self.sites = SiteManager.site_manager.list()
         self.log = logging.getLogger(__name__)