From 3729a522fec27b3d72c4ef67f167d6b008e1209e Mon Sep 17 00:00:00 2001
From: Max Goodhart <c@chromakode.com>
Date: Sat, 24 Jan 2026 18:32:32 -0800
Subject: [PATCH] Only remove old media if a different media element appears

---
 packages/streamwall/src/preload/mediaPreload.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/streamwall/src/preload/mediaPreload.ts b/packages/streamwall/src/preload/mediaPreload.ts
index ce15442..69af772 100644
--- a/packages/streamwall/src/preload/mediaPreload.ts
+++ b/packages/streamwall/src/preload/mediaPreload.ts
@@ -248,13 +248,16 @@ async function main() {
     }
     media.addEventListener(
       'emptied',
-      () => {
+      async () => {
         console.warn('media emptied, re-acquiring', media)
-        media.remove()
-        acquireMedia()
+        const newMedia = await acquireMedia()
+        if (newMedia !== media) {
+          media.remove()
+        }
       },
       { once: true },
     )
+    return media
   }
 
   if (content.kind === 'video' || content.kind === 'audio') {