diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 74a28194a8..806cf6d465 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -700,8 +700,6 @@ var Dashboard = {
         systemInfo = systemInfo || Dashboard.lastSystemInfo;
 
         ApiClient.openWebSocket(systemInfo.WebSocketPortNumber);
-
-        $(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
     },
 
     onWebSocketMessageReceived: function (e, data) {
@@ -711,6 +709,12 @@ var Dashboard = {
         if (msg.MessageType === "LibraryChanged") {
             Dashboard.processLibraryUpdateNotification(msg.Data);
         }
+        else if (msg.MessageType === "ServerShuttingDown") {
+            Dashboard.hideServerRestartWarning();
+        }
+        else if (msg.MessageType === "ServerRestarting") {
+            Dashboard.hideServerRestartWarning();
+        }
         else if (msg.MessageType === "UserDeleted") {
             Dashboard.validateCurrentUser();
         }
@@ -1111,6 +1115,9 @@ var Dashboard = {
 
 var ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion);
 
+$(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
+
+
 $(function () {
 
     var footerHtml = '<div id="footer" class="ui-bar-a">';