diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index c6a7470b7e..8b07145de4 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -211,7 +211,7 @@ namespace MediaBrowser.Api.Playback
         /// <returns>MediaStream.</returns>
         private MediaStream GetMediaStream(IEnumerable<MediaStream> allStream, int? desiredIndex, MediaStreamType type, bool returnFirstIfNoIndex = true)
         {
-            var streams = allStream.Where(s => s.Type == type).ToList();
+            var streams = allStream.Where(s => s.Type == type).OrderBy(i => i.Index).ToList();
 
             if (desiredIndex.HasValue)
             {