diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index 3909f31aff4..1e1d2f931c5 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -3,6 +3,7 @@ import DiscourseController from 'discourse/controllers/controller';
 
 export default DiscourseController.extend(ModalFunctionality, {
   uploadedAvatarTemplate: null,
+  saveDisabled: Em.computed.alias("uploading"),
   hasUploadedAvatar: Em.computed.or('uploadedAvatarTemplate', 'custom_avatar_upload_id'),
 
   selectedUploadId: function() {
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
index 0e375179c2b..876bf10017e 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
@@ -25,6 +25,7 @@
       {{avatar-uploader username=username
                         uploadedAvatarTemplate=uploadedAvatarTemplate
                         custom_avatar_upload_id=custom_avatar_upload_id
+                        uploading=uploading
                         done="useUploadedAvatar"}}
     </div>
   </div>