diff --git a/app/models/assignment.rb b/app/models/assignment.rb
index 8c994b34f62..bf15b4460b8 100644
--- a/app/models/assignment.rb
+++ b/app/models/assignment.rb
@@ -1030,10 +1030,7 @@ def current_grader_data
       groups[[group_id, group_name, count]]
       groups[[group_id, group_name, count]] << { grader: ta, hidden: hidden } unless ta.nil?
     end
-    group_sections = {}
-    self.groupings.includes(:section).find_each do |g|
-      group_sections[g.id] = g.section&.id
-    end
+    group_sections = self.groupings.left_outer_joins(:section).pluck('groupings.id', 'sections.id').to_h
     groups = groups.map do |k, v|
       {
         _id: k[0],