diff --git a/addons/mail/models/mail_channel_partner.py b/addons/mail/models/mail_channel_partner.py
index 5860c704c59..e012f5ebb9e 100644
--- a/addons/mail/models/mail_channel_partner.py
+++ b/addons/mail/models/mail_channel_partner.py
@@ -66,7 +66,7 @@ class ChannelPartner(models.Model):
         return super(ChannelPartner, self).write(vals)
 
     def unlink(self):
-        self.sudo().rtc_session_ids.unlink()
+        self.sudo().rtc_session_ids._disconnect()
         return super().unlink()
 
     @api.model
diff --git a/addons/mail/static/src/models/thread/thread.js b/addons/mail/static/src/models/thread/thread.js
index f58e2c94b94..9d874019d1d 100644
--- a/addons/mail/static/src/models/thread/thread.js
+++ b/addons/mail/static/src/models/thread/thread.js
@@ -822,6 +822,9 @@ function factory(dependencies) {
                 }
             }
             this.mailRtc && this.mailRtc.filterCallees(this.rtcSessions);
+            if (this.mailRtc && !this.mailRtc.currentRtcSession) {
+                this.endCall();
+            }
         }
 
         /**