diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
index 21f48ea437..a2c62e9bb7 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
@@ -205,7 +205,7 @@ define(['browser'], function (browser) {
     function getMaxBitrate() {
 
         if (browser.edgeUwp) {
-            return 30000000;
+            return 32000000;
         }
 
         // 10mbps
@@ -264,14 +264,12 @@ define(['browser'], function (browser) {
         // Otherwise with HLS and mp3 audio we're seeing some browsers
         // safari is lying
         if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || browser.edgeUwp || browser.tizen) {
-            if ((options.disableVideoAudioCodecs || []).indexOf('ac3') === -1) {
-                videoAudioCodecs.push('ac3');
+            videoAudioCodecs.push('ac3');
 
-                // This works in edge desktop, but not mobile
-                // TODO: Retest this on mobile
-                if (!browser.edge || !browser.touch) {
-                    hlsVideoAudioCodecs.push('ac3');
-                }
+            // This works in edge desktop, but not mobile
+            // TODO: Retest this on mobile
+            if (!browser.edge || !browser.touch) {
+                hlsVideoAudioCodecs.push('ac3');
             }
         }
 
@@ -302,6 +300,14 @@ define(['browser'], function (browser) {
             //videoAudioCodecs.push('truehd');
         }
 
+        videoAudioCodecs = videoAudioCodecs.filter(function(c) {
+            return (options.disableVideoAudioCodecs || []).indexOf(c) === -1;
+        });
+
+        hlsVideoAudioCodecs = hlsVideoAudioCodecs.filter(function (c) {
+            return (options.disableHlsVideoAudioCodecs || []).indexOf(c) === -1;
+        });
+
         var mp4VideoCodecs = [];
         if (canPlayH264()) {
             mp4VideoCodecs.push('h264');
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index c06ee4a4aa..cfcae08d5d 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -148,14 +148,20 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
 
         function getProfileOptions(item) {
 
-            var disableVideoAudioCodecs = [];
-            if (!AppInfo.isNativeApp && !item.RunTimeTicks) {
-                disableVideoAudioCodecs.push('ac3');
-            }
-
             var options = {};
 
             if (!AppInfo.isNativeApp) {
+                var disableHlsVideoAudioCodecs = [];
+
+                if (!self.canPlayNativeHls()) {
+                    // hls.js does not support this
+                    disableHlsVideoAudioCodecs.push('mp3');
+                }
+                if (!item.RunTimeTicks) {
+                    // hls.js does not support this
+                    disableHlsVideoAudioCodecs.push('ac3');
+                }
+
                 options.enableMkvProgressive = item.RunTimeTicks != null;
 
                 if (item.RunTimeTicks == null) {
@@ -163,9 +169,8 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
                 }
 
                 options.enableMkvProgressive = false;
-                options.disableVideoAudioCodecs = disableVideoAudioCodecs;
+                options.disableHlsVideoAudioCodecs = disableHlsVideoAudioCodecs;
             }
-
             return options;
         }