From 5580da8ecfb377c2c0516c26df93a5d06b68caed Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Mon, 20 Apr 2026 16:57:45 +0300
Subject: [PATCH] fix: reselection loop

---
 src/routes/Player/Player.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index d56952e8d..662717b70 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -474,16 +474,20 @@ const Player = ({ urlParams, queryParams }) => {
                         findTrackByLang(video.state.extraSubtitlesTracks, settings.subtitlesLanguage);
 
             if (subtitlesTrack && subtitlesTrack.id) {
-                video.setSubtitlesTrack(subtitlesTrack.id);
+                if (video.state.selectedSubtitlesTrackId !== subtitlesTrack.id) {
+                    video.setSubtitlesTrack(subtitlesTrack.id);
+                }
                 defaultSubtitlesSelected.current = true;
             } else if (extraSubtitlesTrack && extraSubtitlesTrack.id) {
-                video.setExtraSubtitlesTrack(extraSubtitlesTrack.id);
+                if (video.state.selectedExtraSubtitlesTrackId !== extraSubtitlesTrack.id) {
+                    video.setExtraSubtitlesTrack(extraSubtitlesTrack.id);
+                }
                 if (savedIsExternal) {
                     defaultSubtitlesSelected.current = true;
                 }
             }
         }
-    }, [video.state.subtitlesTracks, video.state.extraSubtitlesTracks, player.streamState]);
+    }, [video.state.subtitlesTracks, video.state.extraSubtitlesTracks, video.state.selectedSubtitlesTrackId, video.state.selectedExtraSubtitlesTrackId, player.streamState]);
 
     // Auto audio track selection
     React.useEffect(() => {