From 0f9fddd56979677446a1a9a2ba4ddeb2ead7230c Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Tue, 21 Jul 2026 18:57:13 +0300
Subject: [PATCH] fix: avoid reloading external subtitles

---
 src/routes/Player/useSubtitles.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/routes/Player/useSubtitles.ts b/src/routes/Player/useSubtitles.ts
index 26de76d74..16a6f2a57 100644
--- a/src/routes/Player/useSubtitles.ts
+++ b/src/routes/Player/useSubtitles.ts
@@ -197,8 +197,9 @@ const useSubtitles = ({
         }
 
         if (extraTrack?.id) {
-            if (video.state.selectedExtraSubtitlesTrackId !== extraTrack.id ||
-                video.state.selectedSubtitlesTrackId !== null) {
+            // Keep the first external match while waiting for an embedded track.
+            // Add-on subtitle results can arrive in stages and reorder `extraTrack`.
+            if (video.state.selectedExtraSubtitlesTrackId === null) {
                 video.setExtraSubtitlesTrack(extraTrack.id);
             }