diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index b45bc4d845..646c902a5d 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -487,6 +487,10 @@ function tryRemoveElement(elem) {
                 secondaryTrackValid = false;
             }
 
+            this.#audioTrackIndexToSetOnPlaying = options.playMethod === 'Transcode' ? null : options.mediaSource.DefaultAudioStreamIndex;
+
+            this._currentPlayOptions = options;
+
             // Get the secondary track that has been set during this watch session
             let currentSecondaryTrackIndex = playbackManager.getSecondarySubtitleStreamIndex(this);
 
@@ -503,10 +507,6 @@ function tryRemoveElement(elem) {
                 }
             }
 
-            this.#audioTrackIndexToSetOnPlaying = options.playMethod === 'Transcode' ? null : options.mediaSource.DefaultAudioStreamIndex;
-
-            this._currentPlayOptions = options;
-
             const crossOrigin = getCrossOriginValue(options.mediaSource);
             if (crossOrigin) {
                 elem.crossOrigin = crossOrigin;