diff --git a/assets/js/components/calls/controller.js b/assets/js/components/calls/controller.js
index b67328fc..1515d6e0 100644
--- a/assets/js/components/calls/controller.js
+++ b/assets/js/components/calls/controller.js
@@ -17,7 +17,7 @@ class CallsController {
 	 * @param {Conversation} conv Information about the target conversation
 	 */
 	static Open(conv) {
-		if(OpenConversations.has(conv.ID))
+		if(OpenConversations.has(conv.ID) && OpenConversations.get(conv.ID).rootEl.isConnected)
 			return;
 		
 		console.info("Open call for conversation " + conv.ID);
diff --git a/assets/js/components/calls/window.js b/assets/js/components/calls/window.js
index a467f071..dacc1557 100644
--- a/assets/js/components/calls/window.js
+++ b/assets/js/components/calls/window.js
@@ -369,7 +369,7 @@ class CallWindow extends CustomEvents {
 		this.mainPeer.on("close", () => {
 			console.log("Connection to main peer was closed.")
 			if(this.mainPeer)
-				this.Close(true);
+				this.Close(false);
 		});
 	}