diff --git a/src/controllers/session/login/index.html b/src/controllers/session/login/index.html
index 59aae59e24..0c9eb14f18 100644
--- a/src/controllers/session/login/index.html
+++ b/src/controllers/session/login/index.html
@@ -37,8 +37,8 @@
             <button is="emby-button" type="button" class="raised cancel block btnManual">
                 <span>${ButtonManualLogin}</span>
             </button>
-			
-            <button is="emby-button" type="button" class="raised cancel block btnQuick">
+
+            <button is="emby-button" type="button" class="raised cancel block btnQuick hide">
                 <span>${ButtonUseQuickConnect}</span>
             </button>
 
diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js
index 35191a1954..abf2b9b33d 100644
--- a/src/controllers/session/login/index.js
+++ b/src/controllers/session/login/index.js
@@ -263,6 +263,17 @@ import toast from '../../../components/toast/toast';
             }
 
             const apiClient = getApiClient();
+
+            apiClient.getQuickConnect('Status')
+                .then(status => {
+                    if (status !== 'Unavailable') {
+                        view.querySelector('.btnQuick').classList.remove('hide');
+                    }
+                })
+                .catch(() => {
+                    console.debug('Failed to get QuickConnect status');
+                });
+
             apiClient.getPublicUsers().then(function (users) {
                 if (users.length) {
                     showVisualForm();
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
index fc856e6219..99d231737c 100644
--- a/src/controllers/user/menu/index.html
+++ b/src/controllers/user/menu/index.html
@@ -49,7 +49,7 @@
                 </a>
 
 
-                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkQuickConnectPreferences listItem-border">
+                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkQuickConnectPreferences listItem-border hide">
                     <div class="listItem">
                         <em class="material-icons listItemIcon listItemIcon-transparent">tap_and_play</em>
                         <div class="listItemBody">
diff --git a/src/controllers/user/menu/index.js b/src/controllers/user/menu/index.js
index cfc5b5f4a5..b6890b001e 100644
--- a/src/controllers/user/menu/index.js
+++ b/src/controllers/user/menu/index.js
@@ -41,6 +41,16 @@ export default function (view, params) {
             page.querySelector('.selectServer').classList.add('hide');
         }
 
+        ApiClient.getQuickConnect('Status')
+            .then(status => {
+                if (status !== 'Unavailable') {
+                    page.querySelector('.lnkQuickConnectPreferences').classList.remove('hide');
+                }
+            })
+            .catch(() => {
+                console.debug('Failed to get QuickConnect status');
+            });
+
         ApiClient.getUser(userId).then(function (user) {
             page.querySelector('.headerUsername').innerHTML = user.Name;
             if (user.Policy.IsAdministrator && !layoutManager.tv) {