diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index 3e6505b1909..d89aaae30b7 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -11,6 +11,12 @@ export default Em.Component.extend(UploadMixin, {
     return uploading ? I18n.t("uploading") : I18n.t("user.invited.bulk_invite.text");
   },
 
+  @computed("uploading")
+  uploadButtonDisabled(uploading) {
+    // https://github.com/emberjs/ember.js/issues/10976#issuecomment-132417731
+    return uploading ? true : null;
+  },
+
   uploadDone() {
     bootbox.alert(I18n.t("user.invited.bulk_invite.success"));
   }
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
index eab8d71fc96..a29839a7909 100644
--- a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}}>
+<label class="btn" disabled={{uploadButtonDisabled}}>
   {{fa-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input disabled={{uploading}} type="file" accept=".csv" style="visibility: hidden; position: absolute;" />
 </label>