diff --git a/Gemfile.lock b/Gemfile.lock
index 465713d26..2588ddf6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memory_profiler (0.9.0)
-    message_bus (1.0.6)
+    message_bus (1.0.7)
       eventmachine
       rack (>= 1.1.3)
       redis
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 40ef1d2a5..4676e6d32 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -259,6 +259,11 @@ export default DiscourseController.extend({
       }
     });
 
+    this.messageBus.pause();
+    promise.finally(function(){
+      self.messageBus.resume();
+    });
+
     return promise;
   },