diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index 280690f30..f962efcfa 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -290,7 +290,8 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
         // bind on the click event on the cancel link
         $('#cancel-file-upload').on('click', function() {
           // cancel the upload
-          // NOTE: this will trigger a 'fileuploadfail' event with status = 0
+          self.set('isUploading', false);
+          // NOTE: this might trigger a 'fileuploadfail' event with status = 0
           if (jqXHR) jqXHR.abort();
           // unbind
           $(this).off('click');