diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index e557142727..7ebe1e4d89 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -47,7 +47,7 @@
         function updateDeviceProfileForAndroid(profile) {
 
             // Just here as an easy escape out, if ever needed
-            var enableVlcVideo = true;
+            var enableVlcVideo = window.VlcAudio;
             var enableVlcAudio = true;
 
             if (enableVlcVideo) {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3ad46d8252..b0ba15ae7e 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1812,7 +1812,7 @@ var AppInfo = {};
     }
 
     function getBowerPath() {
-        
+
         var bowerPath = "bower_components";
 
         // Put the version into the bower path since we can't easily put a query string param on html imports
@@ -2040,7 +2040,7 @@ var AppInfo = {};
     }
 
     function initRequireWithBrowser(browser) {
-        
+
         var bowerPath = getBowerPath();
 
         var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
@@ -2368,11 +2368,14 @@ var AppInfo = {};
                     // Remove special characters
                     var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
 
-                    var deviceId = window.MainActivity ? MainActivity.getLegacyDeviceId() : null;
-                    deviceId = deviceId || device.uuid;
+                    var deviceId = null;
+
+                    if (window.MainActivity) {
+                        deviceId = MainActivity.getLegacyDeviceId();
+                    }
 
                     resolve({
-                        deviceId: deviceId,
+                        deviceId: deviceId || device.uuid,
                         deviceName: cleanDeviceName,
                         appName: name,
                         appVersion: appVersion