diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
index 72b5d4fffb..7180f88f4c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
@@ -370,6 +370,16 @@ define(['browser'], function (browser) {
 
         profile.TranscodingProfiles = [];
 
+        if (canPlayNativeHls() && options.enableHlsAudio) {
+            profile.TranscodingProfiles.push({
+                Container: 'ts',
+                Type: 'Audio',
+                AudioCodec: 'aac',
+                Context: 'Streaming',
+                Protocol: 'hls'
+            });
+        }
+
         ['opus', 'mp3', 'aac', 'wav'].filter(canPlayAudioFormat).forEach(function (audioFormat) {
 
             profile.TranscodingProfiles.push({
@@ -390,11 +400,6 @@ define(['browser'], function (browser) {
             });
         });
 
-        var copyTimestamps = false;
-        if (browser.chrome) {
-            copyTimestamps = true;
-        }
-
         // Can't use mkv on mobile because we have to use the native player controls and they won't be able to seek it
         if (canPlayMkv && !browser.tizen && options.enableMkvProgressive !== false) {
             profile.TranscodingProfiles.push({
@@ -404,7 +409,7 @@ define(['browser'], function (browser) {
                 VideoCodec: 'h264',
                 Context: 'Streaming',
                 MaxAudioChannels: physicalAudioChannels.toString(),
-                CopyTimestamps: copyTimestamps
+                CopyTimestamps: true
             });
         }
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js
index b8d60c177c..5cc38b3ec5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js
@@ -972,7 +972,7 @@
 
         self.getPlayerState = function () {
 
-            return Promise.resolve(self.getPlayerStateInternal());
+            return Promise.resolve(self.getPlayerStateInternal() || {});
         };
 
         function normalizePrimaryImage(state) {