diff --git a/app/presenters/analyze/graph/column/ell_column/ell_count.rb b/app/presenters/analyze/graph/column/ell_column/ell_count.rb
index 66c0ca79..fa20518a 100644
--- a/app/presenters/analyze/graph/column/ell_column/ell_count.rb
+++ b/app/presenters/analyze/graph/column/ell_column/ell_count.rb
@@ -8,7 +8,7 @@ module Analyze
           end
 
           def n_size(year_index)
-            SurveyItemResponse.where(ell:, survey_item: measure.student_survey_items, school:, grade: grades,
+            SurveyItemResponse.where(ell:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
                                      academic_year: academic_years[year_index]).select(:response_id).distinct.count
           end
         end
diff --git a/app/presenters/analyze/graph/column/gender_column/gender_count.rb b/app/presenters/analyze/graph/column/gender_column/gender_count.rb
index 874c7cde..97460248 100644
--- a/app/presenters/analyze/graph/column/gender_column/gender_count.rb
+++ b/app/presenters/analyze/graph/column/gender_column/gender_count.rb
@@ -8,7 +8,7 @@ module Analyze
           end
 
           def n_size(year_index)
-            SurveyItemResponse.where(gender:, survey_item: measure.student_survey_items, school:, grade: grades,
+            SurveyItemResponse.where(gender:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
                                      academic_year: academic_years[year_index]).select(:response_id).distinct.count
           end
         end
diff --git a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
index 6b28c74a..10d924ae 100644
--- a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
+++ b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
@@ -122,7 +122,7 @@ module Analyze
         end
 
         def n_size(year_index)
-          SurveyItemResponse.where(survey_item: measure.student_survey_items, school:, grade: grades,
+          SurveyItemResponse.where(survey_item: measure.student_survey_items, school:, grade: grades(year_index),
                                    academic_year: academic_years[year_index]).select(:response_id).distinct.count
         end
 
@@ -145,8 +145,8 @@ module Analyze
           end
         end
 
-        def grades
-          Respondent.by_school_and_year(school:, academic_year: academic_years)&.enrollment_by_grade&.keys
+        def grades(year_index)
+          Respondent.by_school_and_year(school:, academic_year: academic_years[year_index]).enrollment_by_grade.keys
         end
 
         private
diff --git a/app/presenters/analyze/graph/column/income_column/income_count.rb b/app/presenters/analyze/graph/column/income_column/income_count.rb
index a61bdc61..642f7308 100644
--- a/app/presenters/analyze/graph/column/income_column/income_count.rb
+++ b/app/presenters/analyze/graph/column/income_column/income_count.rb
@@ -8,7 +8,7 @@ module Analyze
           end
 
           def n_size(year_index)
-            SurveyItemResponse.where(income:, survey_item: measure.student_survey_items, school:, grade: grades,
+            SurveyItemResponse.where(income:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
                                      academic_year: academic_years[year_index]).select(:response_id).distinct.count
           end
         end
diff --git a/app/presenters/analyze/graph/column/sped_column/sped_count.rb b/app/presenters/analyze/graph/column/sped_column/sped_count.rb
index 61975708..72f1b78f 100644
--- a/app/presenters/analyze/graph/column/sped_column/sped_count.rb
+++ b/app/presenters/analyze/graph/column/sped_column/sped_count.rb
@@ -8,7 +8,7 @@ module Analyze
           end
 
           def n_size(year_index)
-            SurveyItemResponse.where(sped:, survey_item: measure.student_survey_items, school:, grade: grades,
+            SurveyItemResponse.where(sped:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
                                      academic_year: academic_years[year_index]).select(:response_id).distinct.count
           end
         end