diff --git a/js/media/elementSource.ts b/js/media/elementSource.ts
index 4dbe6037..a88b4c07 100644
--- a/js/media/elementSource.ts
+++ b/js/media/elementSource.ts
@@ -163,6 +163,8 @@ export default class ElementSource {
   }
 
   dispose() {
+    // TODO: Dispose subscriptions to this.audio
+    this.stop();
     this._emitter.dispose();
   }
 }
diff --git a/js/webampLazy.tsx b/js/webampLazy.tsx
index 02317ebb..67ba33d7 100644
--- a/js/webampLazy.tsx
+++ b/js/webampLazy.tsx
@@ -383,6 +383,7 @@ class Winamp {
   dispose() {
     // TODO: Clean up store subscription in onTrackDidChange
     // TODO: Every storeHas call represents a potential race condition
+    this.media.dispose();
     this._actionEmitter.dispose();
     this._disposable.dispose();
   }