From e2c5c43dad430e33646eafd4e33de1317fc07c74 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Thu, 30 Apr 2026 11:54:20 +0300
Subject: [PATCH] fix: improve auto selection of subs

---
 src/routes/Player/Player.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 0fdee56e1..73523bb0b 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -571,12 +571,14 @@ const Player = ({ urlParams, queryParams }) => {
                         findTrackByLang(video.state.extraSubtitlesTracks, settings.subtitlesLanguage);
 
             if (subtitlesTrack && subtitlesTrack.id) {
-                if (video.state.selectedSubtitlesTrackId !== subtitlesTrack.id) {
+                if (video.state.selectedSubtitlesTrackId !== subtitlesTrack.id ||
+                    video.state.selectedExtraSubtitlesTrackId !== null) {
                     video.setSubtitlesTrack(subtitlesTrack.id);
                 }
                 defaultSubtitlesSelected.current = true;
             } else if (extraSubtitlesTrack && extraSubtitlesTrack.id) {
-                if (video.state.selectedExtraSubtitlesTrackId !== extraSubtitlesTrack.id) {
+                if (video.state.selectedExtraSubtitlesTrackId !== extraSubtitlesTrack.id ||
+                    video.state.selectedSubtitlesTrackId !== null) {
                     video.setExtraSubtitlesTrack(extraSubtitlesTrack.id);
                 }
                 if (savedIsExternal) {