diff --git a/extension/background.js b/extension/background.js
index f0118bb..9162e6a 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -431,6 +431,8 @@ async function routeToContent(action, payload) {
                 files: ['content.js']
             }).then(() => {
                 setTimeout(() => routeToContent(action, payload), 500);
+            }).catch(err => {
+                addLog(`Auto-reinject failed for tab ${tabId}`, 'warn');
             });
         } else {
             addLog(`Content Script not responding in tab ${tabId}`, 'warn');
diff --git a/server/index.js b/server/index.js
index 416ae25..ef4e863 100644
--- a/server/index.js
+++ b/server/index.js
@@ -174,6 +174,7 @@ io.on('connection', (socket) => {
                 if (oldRoom) {
                     oldRoom.peers.delete(socket.id);
                     oldRoom.peerIds.delete(socket.id);
+                    oldRoom.peerData.delete(socket.id);
                     socket.to(oldMapping.roomId).emit(EVENTS.PEER_STATUS, { peerId: oldMapping.peerId, status: 'left' });
                     if (oldRoom.peers.size === 0) rooms.delete(oldMapping.roomId);
                 }