diff --git a/Shared/Extensions/JellyfinAPI/MediaStream.swift b/Shared/Extensions/JellyfinAPI/MediaStream.swift
index 58311db5..7b702acf 100644
--- a/Shared/Extensions/JellyfinAPI/MediaStream.swift
+++ b/Shared/Extensions/JellyfinAPI/MediaStream.swift
@@ -225,10 +225,10 @@ extension [MediaStream] {
 
         for (i, mediaStream) in mediaStreams.enumerated() {
             guard mediaStream.isExternal ?? false else { continue }
-            var _mediaStream = mediaStream
-            _mediaStream.index = 1 + embeddedSubtitleCount + audioStreamCount
+            var copy = mediaStream
+            copy.index = (copy.index ?? 0) + 1 + embeddedSubtitleCount + audioStreamCount
 
-            mediaStreams[i] = _mediaStream
+            mediaStreams[i] = copy
         }
 
         return mediaStreams