diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
index 133fbbb7a..c6bd8c46f 100644
--- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
@@ -234,6 +234,10 @@ export default class AssistManager {
       }
     }, 3000);
     conn.on('close', onDataClose);// Does it work ?
+    conn.on("error", (e) => {
+      console.log("PeerJS connection error", e);
+      update({ peerConnectionStatus: ConnectionStatus.Error });
+    })
   }
 
 
@@ -331,7 +335,7 @@ export default class AssistManager {
     call.on("close", this.onCallEnd);
     call.on("error", (e) => {
       console.error("PeerJS error (on call):", e)
-      this.onCallEnd?.();
+      this.initiateCallEnd?.();
       onError?.();
     });