diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cdb20e2129f..8880d6304b3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -870,6 +870,8 @@ class UsersController < ApplicationController
         return render_json_error I18n.t("avatar.missing")
       end
 
+      user.create_user_avatar unless user.user_avatar
+
       if type == "gravatar"
         user.user_avatar.gravatar_upload_id = upload_id
       else