diff --git a/common/views/WatchTogether/Lobby.svelte b/common/views/WatchTogether/Lobby.svelte
index eaf15b6d..d72593a4 100644
--- a/common/views/WatchTogether/Lobby.svelte
+++ b/common/views/WatchTogether/Lobby.svelte
@@ -82,7 +82,7 @@
         <div class='font-size-20 font-weight-bold pl-5 pb-10'>
           {Object.values($peers).length} Member(s)
         </div>
-        {#each Object.values($peers) as user}
+        {#each Object.values($peers) as { user }}
           <User {user} />
         {/each}
       {/if}
diff --git a/common/views/WatchTogether/w2g.js b/common/views/WatchTogether/w2g.js
index 65e474ba..c41ad124 100644
--- a/common/views/WatchTogether/w2g.js
+++ b/common/views/WatchTogether/w2g.js
@@ -217,8 +217,7 @@ export class W2GClient extends EventEmitter {
   /** @param {import('./events.js').default} event */
   #sendToPeers (event) {
     if (!this.#p2pt) return
-
-    for (const { peer } of Object.values(this.peers)) {
+    for (const { peer } of Object.values(this.peers.value)) {
       if (peer) this.#sendEvent(peer, event)
     }
   }
@@ -226,6 +225,7 @@ export class W2GClient extends EventEmitter {
   destroy () {
     debug('destroy')
     this.#p2pt.destroy()
+    this.removeAllListeners()
     this.#p2pt = null
     this.isHost = false
     this.peers.value = {}