From bbfe25177bc320ffe46a2effcec0b3adbb9f053c Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Fri, 17 Apr 2026 17:38:31 +0300
Subject: [PATCH] fix: prioritize embedded subs first

---
 src/routes/Player/Player.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 9b1e57f5f..977a41835 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -461,6 +461,7 @@ const Player = ({ urlParams, queryParams }) => {
 
             const savedTrackId = player.streamState?.subtitleTrack?.id;
             const savedLang = player.streamState?.subtitleTrack?.lang;
+            const savedIsExternal = savedTrackId && player.streamState?.subtitleTrack?.embedded === false;
 
             const subtitlesTrack =
                 savedTrackId ? findTrackById(video.state.subtitlesTracks, savedTrackId) :
@@ -477,7 +478,9 @@ const Player = ({ urlParams, queryParams }) => {
                 defaultSubtitlesSelected.current = true;
             } else if (extraSubtitlesTrack && extraSubtitlesTrack.id) {
                 video.setExtraSubtitlesTrack(extraSubtitlesTrack.id);
-                defaultSubtitlesSelected.current = true;
+                if (savedIsExternal) {
+                    defaultSubtitlesSelected.current = true;
+                }
             }
         }
     }, [video.state.subtitlesTracks, video.state.extraSubtitlesTracks, player.streamState]);