diff --git a/addons/mail/static/src/js/thread_widget.js b/addons/mail/static/src/js/thread_widget.js
index 3ec66d02520..0a58b13d5ad 100644
--- a/addons/mail/static/src/js/thread_widget.js
+++ b/addons/mail/static/src/js/thread_widget.js
@@ -260,11 +260,14 @@ var ThreadWidget = Widget.extend({
      */
     removeMessageAndRender: function (messageID, thread, options) {
         var self = this;
+        this._currentThreadID = thread.getID();
         return new Promise(function (resolve, reject) {
             self.$('.o_thread_message[data-message-id="' + messageID + '"]')
             .fadeOut({
                 done: function () {
-                    self.render(thread, options);
+                    if (self._currentThreadID === thread.getID()) {
+                        self.render(thread, options);
+                    }
                     resolve();
                 },
                 duration: 200,