diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 9550ef0b825..a9d77ba06b2 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -404,13 +404,15 @@ export default Ember.Controller.extend({
   disableSubmit: Ember.computed.or("model.loading", "isUploading"),
 
   save(force) {
-    const composer = this.get('model');
+    if (this.get("disableSubmit")) return;
 
     // Clear the warning state if we're not showing the checkbox anymore
     if (!this.get('showWarning')) {
       this.set('model.isWarning', false);
     }
 
+    const composer = this.get('model');
+
     if (composer.get('cantSubmitPost')) {
       this.set('lastValidatedAt', Date.now());
       return;