diff --git a/app/controllers/case_contacts_controller.rb b/app/controllers/case_contacts_controller.rb
index 4d154d0618..60d783b1b6 100644
--- a/app/controllers/case_contacts_controller.rb
+++ b/app/controllers/case_contacts_controller.rb
@@ -115,7 +115,12 @@ def current_organization_groups
   end
 
   def all_case_contacts
-    policy_scope(current_organization.case_contacts).includes(:creator, contact_types: :contact_type_group)
+    policy_scope(current_organization.case_contacts).includes(
+      :creator,
+      :followups,
+      :contact_types,
+      contact_topic_answers: [:contact_topic]
+    )
   end
 
   def additional_expense_params
diff --git a/app/models/case_contact.rb b/app/models/case_contact.rb
index 6c22c194bf..213c55d1be 100644
--- a/app/models/case_contact.rb
+++ b/app/models/case_contact.rb
@@ -240,7 +240,7 @@ def contact_groups_with_types
   end
 
   def requested_followup
-    followups.requested.first
+    followups.find(&:requested?)
   end
 
   def should_send_reimbursement_email?
diff --git a/app/presenters/case_contact_presenter.rb b/app/presenters/case_contact_presenter.rb
index 1f1a80fdc5..671cbfe975 100644
--- a/app/presenters/case_contact_presenter.rb
+++ b/app/presenters/case_contact_presenter.rb
@@ -28,6 +28,6 @@ def org_cases
     CasaOrg.includes(:casa_cases)
       .references(:casa_cases)
       .find_by(id: current_user.casa_org_id)
-      .casa_cases.includes(:case_contacts)
+      .casa_cases
   end
 end
diff --git a/app/views/casa_cases/show.html.erb b/app/views/casa_cases/show.html.erb
index 42d37c2bc9..d7c04eabb2 100644
--- a/app/views/casa_cases/show.html.erb
+++ b/app/views/casa_cases/show.html.erb
@@ -130,14 +130,14 @@
           <%= render(partial: "case_contacts/case_contact",
                     collection: @casa_case.decorate
                       .case_contacts_ordered_by_occurred_at
-                      .includes(contact_types: [:contact_type_group])
+                      .includes(:contact_types)
                       .grab_all(current_user),
                     as: :contact) %>
         <% else %>
           <%= render(partial: "case_contacts/case_contact",
                     collection: @casa_case.decorate
                       .case_contacts_filtered_by_active_assignment_ordered_by_occurred_at
-                      .includes(contact_types: [:contact_type_group])
+                      .includes(:contact_types)
                       .grab_all(current_user),
                     as: :contact) %>
         <% end %>