diff --git a/src/bower_components/emby-apiclient/sync/serversync.js b/src/bower_components/emby-apiclient/sync/serversync.js
index dacc70f73c..34a1b11e8e 100644
--- a/src/bower_components/emby-apiclient/sync/serversync.js
+++ b/src/bower_components/emby-apiclient/sync/serversync.js
@@ -12,7 +12,7 @@ define([], function() {
     }
 
     function uploadContent(connectionManager, server, options) {
-        return new Promise().resolve();
+        return new Promise().reject();
     }
 
     function syncMedia(connectionManager, server, options) {
diff --git a/src/components/apphost.js b/src/components/apphost.js
index c8b98ba74d..478f7a4f92 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -114,10 +114,10 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function(appSett
     function onAppHidden() {
         _isHidden || (_isHidden = !0, console.log("app is hidden"))
     }
-    var htmlMediaAutoplayAppStorageKey = "supportshtmlmediaautoplay0",
+    var htmlMediaAutoplayAppStorageKey = "supportshtmlmediaautoplay0";
         supportedFeatures = function() {
             var features = [];
-            return navigator.share && features.push("sharing");
+            navigator.share && features.push("sharing");
             browser.edgeUwp || browser.tv || browser.xboxOne || browser.ps4 || features.push("filedownload");
             browser.operaTv || browser.tizen || browser.orsay || browser.web0s
                 ? features.push("exit")
@@ -138,18 +138,19 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function(appSett
             browser.orsay || browser.tizen || features.push("subtitleburnsettings");
             browser.tv || browser.ps4 || browser.xboxOne || features.push("fileinput");
             browser.chrome && features.push("chromecast");
+            return features;
         }();
         if (supportedFeatures.indexOf("htmlvideoautoplay") === -1 && supportsHtmlMediaAutoplay() !=== false) {
             require(["autoPlayDetect"], function(autoPlayDetect) {
-            autoPlayDetect.supportsHtmlMediaAutoplay().then(function() {
-                appSettings.set(htmlMediaAutoplayAppStorageKey, "true");
-                supportedFeatures.push("htmlvideoautoplay");
-                supportedFeatures.push("htmlaudioautoplay");
-            }, function() {
-                appSettings.set(htmlMediaAutoplayAppStorageKey, "false");
-            });
-        }
-    });
+                autoPlayDetect.supportsHtmlMediaAutoplay().then(function() {
+                    appSettings.set(htmlMediaAutoplayAppStorageKey, "true");
+                    supportedFeatures.push("htmlvideoautoplay");
+                    supportedFeatures.push("htmlaudioautoplay");
+                }, function() {
+                    appSettings.set(htmlMediaAutoplayAppStorageKey, "false");
+                });
+            }
+        });
     var deviceId, deviceName, visibilityChange, visibilityState, appVersion = window.dashboardVersion || "3.0",
         appHost = {
             getWindowState: function() {
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 7cb890ca21..c1ad0150fb 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -213,9 +213,15 @@ var Dashboard = {
 
     function getSettingsBuilder(UserSettings, layoutManager, browser) {
         UserSettings.prototype.enableThemeVideos = function(val) {
-            return null != val
-                ? this.set("enableThemeVideos", val.toString(), !1)
-                : (val = this.get("enableThemeVideos", !1), val ? "false" !== val : !layoutManager.mobile && !browser.slow);
+            if (val != null) {
+                return this.set('enableThemeVideos', val.toString(), false);
+            }
+            val = this.get('enableThemeVideos', false);
+            if (val !== 'false') {
+                return !layoutManager.mobile;
+            } else {
+                return !browser.slow;
+            }
         };
         return UserSettings;
     }