diff --git a/src/components/player/display/base.ts b/src/components/player/display/base.ts
index 8322b82b..b1eb616f 100644
--- a/src/components/player/display/base.ts
+++ b/src/components/player/display/base.ts
@@ -83,7 +83,8 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
 
   function reportAudioTracks() {
     if (!hls) return;
-    const currentTrack = hls.audioTracks[hls.audioTrack];
+    const currentTrack = hls.audioTracks?.[hls.audioTrack ?? 0];
+    if (!currentTrack) return;
     emit("changedaudiotrack", {
       id: currentTrack.id.toString(),
       label: currentTrack.name,
@@ -129,6 +130,7 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
   }
 
   function setupSource(vid: HTMLVideoElement, src: LoadableSource) {
+    hls = null;
     if (src.type === "hls") {
       if (canPlayHlsNatively(vid)) {
         vid.src = processCdnLink(src.url);