diff --git a/lib/webrtc/call.js b/lib/webrtc/call.js
index 0b3ac52b0..7c91b7b92 100644
--- a/lib/webrtc/call.js
+++ b/lib/webrtc/call.js
@@ -166,8 +166,8 @@ MatrixCall.prototype._initWithInvite = function(event) {
     if (event.getAge()) {
         setTimeout(function() {
             if (self.state == 'ringing') {
-                setState(self, 'ended');
                 self.hangupParty = 'remote'; // effectively
+                setState(self, 'ended');
                 stopAllMedia(self);
                 if (self.peerConn.signalingState != 'closed') {
                     self.peerConn.close();
@@ -589,8 +589,8 @@ MatrixCall.prototype._onRemoteStreamStarted = function(event) {
  */
 MatrixCall.prototype._onRemoteStreamEnded = function(event) {
     debuglog("Remote stream ended");
-    setState(this, 'ended');
     this.hangupParty = 'remote';
+    setState(this, 'ended');
     stopAllMedia(this);
     if (this.peerConn.signalingState != 'closed') {
         this.peerConn.close();
@@ -662,9 +662,9 @@ var terminate = function(self, hangupParty, hangupReason, shouldEmit) {
     if (self.getLocalVideoElement() && self.getLocalVideoElement().pause) {
         self.getLocalVideoElement().pause();
     }
-    setState(self, 'ended');
     self.hangupParty = hangupParty;
     self.hangupReason = hangupReason;
+    setState(self, 'ended');
     stopAllMedia(self);
     if (self.peerConn && self.peerConn.signalingState !== 'closed') {
         self.peerConn.close();