diff --git a/app/helpers/ui_helper.rb b/app/helpers/ui_helper.rb
index ece7e79bb4..a9173b6cb3 100644
--- a/app/helpers/ui_helper.rb
+++ b/app/helpers/ui_helper.rb
@@ -5,14 +5,14 @@ def grouped_options_for_assigning_case(volunteer)
     [
       [
         "Not Assigned",
-        CasaCase
+        CasaCase.eager_load([:assigned_volunteers])
           .not_assigned(@volunteer.casa_org).active
           .uniq { |casa_case| casa_case.case_number }
           .map { |casa_case| ["#{casa_case.case_number} - #{volunteer_badge(casa_case, current_user)}".html_safe, casa_case.id] }
       ],
       [
         "Assigned",
-        CasaCase
+        CasaCase.eager_load([:assigned_volunteers])
           .actively_assigned_excluding_volunteer(@volunteer)
           .uniq { |casa_case| casa_case.case_number }
           .map { |casa_case| ["#{casa_case.case_number} - #{volunteer_badge(casa_case, current_user)}".html_safe, casa_case.id] }
diff --git a/app/models/volunteer.rb b/app/models/volunteer.rb
index 0dffd42a85..2bd88fe0f8 100644
--- a/app/models/volunteer.rb
+++ b/app/models/volunteer.rb
@@ -97,7 +97,7 @@ def deactivate
   end
 
   def case_assignments_with_cases
-    case_assignments.includes(:casa_case)
+    case_assignments.includes(casa_case: :assigned_volunteers)
   end
 
   def has_supervisor?