diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
index 205895a5431..3806e2de195 100644
--- a/src/webrtc/call.ts
+++ b/src/webrtc/call.ts
@@ -1717,7 +1717,12 @@ export class MatrixCall extends EventEmitter {
 
         const stream = ev.streams[0];
         this.pushRemoteFeed(stream);
-        stream.addEventListener("removetrack", () => this.deleteFeedByStream(stream));
+        stream.addEventListener("removetrack", () => {
+            if (stream.getTracks().length === 0) {
+                logger.info(`Stream ID ${stream.id} has no tracks remaining - removing`);
+                this.deleteFeedByStream(stream);
+            }
+        });
     };
 
     private onDataChannel = (ev: RTCDataChannelEvent): void => {