diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
index 59360a06b4..f0ad426bc2 100644
--- a/dashboard-ui/scripts/extensions.js
+++ b/dashboard-ui/scripts/extensions.js
@@ -1,4 +1,24 @@
-// Array Remove - By John Resig (MIT Licensed)
+function IsStorageEnabled() {
+    try {
+        localStorage.setItem("__test", "data");
+    } catch (err) {
+        if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') {
+            return false;
+        }
+    }
+    return true;
+}
+
+if (!window.WebSocket) {
+
+    alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
+}
+
+if (!IsStorageEnabled()) {
+    alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
+}
+
+// Array Remove - By John Resig (MIT Licensed)
 Array.prototype.remove = function (from, to) {
     var rest = this.slice((to || from) + 1 || this.length);
     this.length = from < 0 ? this.length + from : from;
@@ -21,17 +41,6 @@ $.fn.checked = function (value) {
     }
 };
 
-function IsStorageEnabled() {
-    try {
-        localStorage.setItem("__test", "data");
-    } catch (err) {
-        if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') {
-            return false;
-        }
-    }
-    return true;
-}
-
 if (!Array.prototype.filter) {
     Array.prototype.filter = function (fun /*, thisp*/) {
         "use strict";
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3c403fdcfb..5639a1ca7f 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1114,11 +1114,6 @@ var Dashboard = {
 
 };
 
-if (!window.WebSocket) {
-
-    alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
-}
-
 var ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion);
 
 $(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
@@ -1164,10 +1159,6 @@ $(function () {
     footerHtml += '</div>';
 
     $(document.body).append(footerHtml);
-
-    if (!IsStorageEnabled()) {
-        alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
-    }
     
     $(window).on("beforeunload", function () {