From 3628f121a27e6c77f41ffa5bdba7b0d38da256f6 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Wed, 13 May 2026 14:42:52 +0200
Subject: [PATCH] fix: audio tracks default selection issue

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

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 4f32e4ec6..de0cd1ca0 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -467,9 +467,8 @@ const Player = ({ urlParams, queryParams }) => {
     React.useEffect(() => {
         if (!defaultAudioTrackSelected.current) {
             const savedTrackId = player.streamState?.audioTrack?.id;
-            const audioTrack = savedTrackId ?
-                findTrackById(video.state.audioTracks, savedTrackId) :
-                findTrackByLang(video.state.audioTracks, settings.audioLanguage);
+            const savedTrack = savedTrackId ? findTrackById(video.state.audioTracks, savedTrackId) : null;
+            const audioTrack = savedTrack ?? findTrackByLang(video.state.audioTracks, settings.audioLanguage);
 
             if (audioTrack && audioTrack.id) {
                 video.setAudioTrack(audioTrack.id);