diff --git a/src/components/apphost.js b/src/components/apphost.js
index 8de18f166f..619cd298b7 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -143,7 +143,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function(appSett
         features.push("displaylanguage");
         features.push("otherapppromotions");
         features.push("targetblank");
-        features.push("multiserver");
+        //features.push("multiserver");
         browser.orsay || browser.tizen || browser.msie || !(browser.firefox || browser.ps4 || browser.edge || cueSupported()) || features.push("subtitleappearancesettings");
         browser.orsay || browser.tizen || features.push("subtitleburnsettings");
         browser.tv || browser.ps4 || browser.xboxOne || features.push("fileinput");
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index c44eb9f6bf..a637a779c4 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -199,7 +199,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         html += "</h3>";
         if (user.localUser) {
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>";
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
+            if (appHost.supports("multiserver")) {
+                html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
+            }
             if (!user.localUser.EnableAutoLogin) {
                 html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
             }