1 files changed, 6 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index 13f0999b3..6ba9b29fa 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -17,7 +17,12 @@ namespace Emby.Server.Implementations.Library
 
             if (preferDefaultTrack)
             {
-                return sortedStreams.FirstOrDefault(i => i.IsDefault)?.Index;
+                var defaultStream = streams.FirstOrDefault(i => i.IsDefault);
+
+                if (defaultStream != null)
+                {
+                    return defaultStream.Index;
+                }
             }
 
             return sortedStreams.FirstOrDefault()?.Index;