1 files changed, 11 insertions, 6 deletions
diff --git a/app/models/members_preloader.rb b/app/models/members_preloader.rb
index ba7e4b39989..f6617fa0888 100644
--- a/app/models/members_preloader.rb
+++ b/app/models/members_preloader.rb
@@ -8,12 +8,17 @@ class MembersPreloader
   end
 
   def preload_all
-    ActiveRecord::Associations::Preloader.new.preload(members, :user)
-    ActiveRecord::Associations::Preloader.new.preload(members, :source)
-    ActiveRecord::Associations::Preloader.new.preload(members, :created_by)
-    ActiveRecord::Associations::Preloader.new.preload(members, user: :status)
-    ActiveRecord::Associations::Preloader.new.preload(members, user: :u2f_registrations)
-    ActiveRecord::Associations::Preloader.new.preload(members, user: :webauthn_registrations) if Feature.enabled?(:webauthn)
+    user_associations = [:status]
+    user_associations << :webauthn_registrations if Feature.enabled?(:webauthn)
+
+    ActiveRecord::Associations::Preloader.new(
+      records: members,
+      associations: [
+        :source,
+        :created_by,
+        { user: user_associations }
+      ]
+    ).call
   end
 end