diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb
index 2f14ad9c3..117567467 100644
--- a/app/controllers/emails_controller.rb
+++ b/app/controllers/emails_controller.rb
@@ -4,7 +4,7 @@ class EmailsController < ApplicationController
   def index
     @email_addresses = authorize EmailAddress.visible(CurrentUser.user).paginated_search(params, count_pages: true)
     @email_addresses = @email_addresses.includes(:user)
-    respond_with(@email_addresses)
+    respond_with(@email_addresses, model: "EmailAddress")
   end
 
   def show
diff --git a/app/models/email_address.rb b/app/models/email_address.rb
index 7d437751d..b5cdc6ce7 100644
--- a/app/models/email_address.rb
+++ b/app/models/email_address.rb
@@ -82,4 +82,8 @@ class EmailAddress < ApplicationRecord
       id == verifier.verified(key)
     end
   end
+
+  def self.available_includes
+    [:user]
+  end
 end
diff --git a/app/models/forum_topic_visit.rb b/app/models/forum_topic_visit.rb
index 8fe1ac8ac..e9c3d4382 100644
--- a/app/models/forum_topic_visit.rb
+++ b/app/models/forum_topic_visit.rb
@@ -10,4 +10,8 @@ class ForumTopicVisit < ApplicationRecord
     q = search_attributes(params, :id, :created_at, :updated_at, :user, :forum_topic_id, :last_read_at)
     q.apply_default_order(params)
   end
+
+  def self.available_includes
+    [:forum_topic]
+  end
 end
diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb
index df0e4be3a..c0bf11992 100644
--- a/app/models/tag_implication.rb
+++ b/app/models/tag_implication.rb
@@ -150,4 +150,8 @@ class TagImplication < TagRelationship
       end
     end
   end
+
+  def self.available_includes
+    super + [:child_implications, :parent_implications]
+  end
 end
diff --git a/app/models/user_event.rb b/app/models/user_event.rb
index ce700a3a4..bb9b37006 100644
--- a/app/models/user_event.rb
+++ b/app/models/user_event.rb
@@ -37,6 +37,10 @@ class UserEvent < ApplicationRecord
     q
   end
 
+  def self.available_includes
+    [:user, :user_session]
+  end
+
   concerning :ConstructorMethods do
     class_methods do
       # Build an event but don't save it yet. The caller is expected to update the user, which will save the event.