diff --git a/app/jobs/regular/update_gravatar.rb b/app/jobs/regular/update_gravatar.rb
index bbff6a6b226..53d4f61a4f4 100644
--- a/app/jobs/regular/update_gravatar.rb
+++ b/app/jobs/regular/update_gravatar.rb
@@ -8,7 +8,7 @@ module Jobs
       user = User.find_by(id: args[:user_id])
       avatar = UserAvatar.find_by(id: args[:avatar_id])
 
-      if user && avatar
+      if user && avatar && avatar.user&.id == user.id
         avatar.update_gravatar!
         if !user.uploaded_avatar_id && avatar.gravatar_upload_id
           user.update_column(:uploaded_avatar_id, avatar.gravatar_upload_id)