diff --git a/mock.py b/mock.py
index 29e80870..79025592 100644
--- a/mock.py
+++ b/mock.py
@@ -163,6 +163,7 @@ def connect_host(self, message):
 
         def proxy():
             forwarder.proxy()
+            self.emit('data', {'data': 'Disconnected', 'room': client_id}, room=client_id)
             self.logout(client_id, connection)
         self.socketio.start_background_task(proxy)
 
diff --git a/src/app/pages/app.component.ts b/src/app/pages/app.component.ts
index a38073a7..84a24de8 100644
--- a/src/app/pages/app.component.ts
+++ b/src/app/pages/app.component.ts
@@ -25,8 +25,9 @@ export class AppComponent {
     const notInIframe = window.self === window.top;
     const notInReplay = location.pathname.indexOf('/luna/replay') === -1;
     if (environment.production && notInIframe && notInReplay) {
-      $event.returnValue = true;
+      return false;
     }
+    return true;
   }
 }