diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index 9e1b9046d..67e9bfb7a 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -49,6 +49,19 @@
                     </div>
                 </div>
 
+                <div class="verticalSection">
+                    <div class="sectionTitleContainer flex align-items-center">
+                        <h2 class="sectionTitle">${QuickConnect}</h2>
+                    </div>
+                </div>
+
+                <div class="checkboxList paperList" style="padding:.5em 1em;">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkQuickConnectAvailable" />
+                        <span>${EnableQuickConnect}</span>
+                    </label>
+                </div>
+
                 <div class="verticalSection">
                     <h2>${HeaderBranding}</h2>
                     <div class="inputContainer">
diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index d919dbf11..6dbdd1401 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -14,6 +14,7 @@ import alert from '../../components/alert';
     function loadPage(page, config, languageOptions, systemInfo) {
         page.querySelector('#txtServerName').value = systemInfo.ServerName;
         page.querySelector('#txtCachePath').value = systemInfo.CachePath || '';
+        page.querySelector('#chkQuickConnectAvailable').checked = config.QuickConnectAvailable === true;
         $('#txtMetadataPath', page).val(systemInfo.InternalMetadataPath || '');
         $('#txtMetadataNetworkPath', page).val(systemInfo.MetadataNetworkPath || '');
         $('#selectLocalizationLanguage', page).html(languageOptions.map(function (language) {
@@ -33,6 +34,7 @@ import alert from '../../components/alert';
             config.CachePath = form.querySelector('#txtCachePath').value;
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.MetadataNetworkPath = $('#txtMetadataNetworkPath', form).val();
+            config.QuickConnectAvailable = form.querySelector('#chkQuickConnectAvailable').checked;
             ApiClient.updateServerConfiguration(config).then(function() {
                 ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
                     brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value;
diff --git a/src/controllers/dashboard/quickConnect.html b/src/controllers/dashboard/quickConnect.html
deleted file mode 100644
index 2b646837c..000000000
--- a/src/controllers/dashboard/quickConnect.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="quickConnectPage" data-role="page" class="page type-interior advancedConfigurationPage">
-    <div class="content-primary">
-        <form class="quickConnectSettings">
-            <div class="verticalSection">
-                <div class="sectionTitleContainer flex align-items-center">
-                    <h2 class="sectionTitle">${QuickConnect}</h2>
-                </div>
-            </div>
-
-            <div>${LabelCurrentStatus}<span id="quickConnectStatus" style="padding:0 0.4em;"></span></div>
-
-            <div class="checkboxList paperList" style="padding:.5em 1em;">
-                <label>
-                    <input type="checkbox" is="emby-checkbox" id="chkQuickConnectAvailable" />
-                    <span>${EnableQuickConnect}</span>
-                </label>
-            </div>
-
-            <button is="emby-button" id="btnQuickConnectSubmit" type="submit" class="raised button-submit block">
-                <span>${Save}</span>
-            </button>
-        </form>
-    </div>
-</div>
diff --git a/src/controllers/dashboard/quickConnect.js b/src/controllers/dashboard/quickConnect.js
deleted file mode 100644
index 0967ed803..000000000
--- a/src/controllers/dashboard/quickConnect.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import loading from '../../components/loading/loading';
-import toast from '../../components/toast/toast';
-import globalize from '../../scripts/globalize';
-
-const unavailable = 'Unavailable';
-const available = 'Available';
-const active = 'Active';
-let page;
-
-export default function(view) {
-    view.addEventListener('viewshow', function () {
-        page = this;
-        loading.show();
-        page.querySelector('#btnQuickConnectSubmit').onclick = onSubmit;
-        updatePage();
-    });
-}
-
-function loadPage(status) {
-    const check = status === available || status === active;
-
-    page.querySelector('#quickConnectStatus').textContent = status.toLocaleLowerCase();
-    page.querySelector('#chkQuickConnectAvailable').checked = check;
-
-    loading.hide();
-}
-
-function onSubmit() {
-    loading.show();
-
-    const newStatus = page.querySelector('#chkQuickConnectAvailable').checked ? available : unavailable;
-
-    const url = ApiClient.getUrl('/QuickConnect/Available?Status=' + newStatus);
-
-    ApiClient.ajax({
-        type: 'POST',
-        url: url
-    }, true).then(() => {
-        toast(globalize.translate('SettingsSaved'));
-        setTimeout(updatePage, 500);
-
-        return true;
-    }).catch((e) => {
-        console.error('Unable to set quick connect status. error:', e);
-    });
-
-    loading.hide();
-    return false;
-}
-
-function updatePage() {
-    ApiClient.getQuickConnect('Status').then((response) => {
-        loadPage(response);
-        return true;
-    }).catch((e) => {
-        console.error('Unable to get quick connect status. error:', e);
-    });
-}
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 4ccf357c7..e57aaba33 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -412,12 +412,6 @@ import Headroom from 'headroom.js';
             pageIds: ['devicesPage', 'devicePage'],
             icon: 'devices'
         });
-        links.push({
-            name: globalize.translate('QuickConnect'),
-            href: '#!/quickConnect.html',
-            pageIds: ['quickConnectPage'],
-            icon: 'tap_and_play'
-        });
         links.push({
             name: globalize.translate('HeaderActivity'),
             href: '#!/serveractivity.html',