diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 3af12c772fa..0e29df3bf53 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -25,12 +25,11 @@ class FlaggedUserSerializer < BasicUserSerializer
       fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
     end
 
-    result = {}
-    fields.each do |k|
-      result[k] = object.custom_fields[k] if object.custom_fields[k].present?
+    if fields.present?
+      User.custom_fields_for_ids([object.id], fields)[object.id] || {}
+    else
+      {}
     end
-
-    result
   end
 
 end