diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index 832aeeb9..14c4e28b 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -2155,7 +2155,8 @@ Metamaps.Realtime = {
         mapper.inConversation = false;
         self.room.chat.mapperLeftCall(id);
 
-        if (self.countOthersInConversation() < 2) {
+        if ((self.inConversation && self.countOthersInConversation() === 0) ||
+            (!self.inConversation && self.countOthersInConversation() === 1)) {
           self.callEnded();
         }
       }