diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index acc97c86..59c14eac 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -104,6 +104,7 @@ const PostStatusForm = {
     },
     postStatus (newStatus) {
       if (this.posting) { return }
+      if (this.submitDisabled) { return }
 
       if (this.newStatus.status === '') {
         if (this.newStatus.files.length > 0) {