diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index a1c32dc63..60c2a7f50 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -693,9 +693,13 @@ namespace MediaBrowser.Api.Playback
 
                 state.VideoStream = GetMediaStream(media.MediaStreams, videoRequest.VideoStreamIndex, MediaStreamType.Video, true);
                 state.SubtitleStream = GetMediaStream(media.MediaStreams, videoRequest.SubtitleStreamIndex, MediaStreamType.Subtitle, false);
+                state.AudioStream = GetMediaStream(media.MediaStreams, videoRequest.AudioStreamIndex, MediaStreamType.Audio, true);
+            }
+            else
+            {
+                state.AudioStream = GetMediaStream(media.MediaStreams, null, MediaStreamType.Audio, true);
             }
 
-            state.AudioStream = GetMediaStream(media.MediaStreams, null, MediaStreamType.Audio, true);
 
             return state;
         }