diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index d6bfc1a8f7..6ba8a62b56 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -88,7 +88,7 @@ public class MediaStreamRepository : IMediaStreamRepository
             query = query.Where(e => e.StreamType == typeValue);
         }
 
-        return query;
+        return query.OrderBy(e => e.StreamIndex);
     }
 
     private MediaStream Map(MediaStreamInfo entity)