diff --git a/app/controllers/instruction/authorization_request_events_controller.rb b/app/controllers/instruction/authorization_request_events_controller.rb
index 3ed098164..f164862e1 100644
--- a/app/controllers/instruction/authorization_request_events_controller.rb
+++ b/app/controllers/instruction/authorization_request_events_controller.rb
@@ -4,7 +4,7 @@ class Instruction::AuthorizationRequestEventsController < Instruction::Authoriza
   def index
     authorize [:instruction, @authorization_request], :show?
 
-    @events = @authorization_request.events.includes(%i[user entity]).order(created_at: :desc).decorate
+    @events = @authorization_request.events.order(created_at: :desc).decorate
   end
 
   private
diff --git a/app/queries/authorization_request_events_query.rb b/app/queries/authorization_request_events_query.rb
index c76aadc7d..388e533b2 100644
--- a/app/queries/authorization_request_events_query.rb
+++ b/app/queries/authorization_request_events_query.rb
@@ -8,6 +8,7 @@ def initialize(authorization_request)
   # rubocop:disable Metrics/AbcSize
   def perform
     AuthorizationRequestEvent
+      .includes(%i[user entity])
       .where(
         sql_query,
         authorization_request.id,
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 64e19fa92..de600505e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -16,6 +16,9 @@
     Bullet.enable        = true
     Bullet.bullet_logger = true
     Bullet.raise         = true # raise an error if n+1 query occurs
+
+    Bullet.add_safelist type: :unused_eager_loading, class_name: 'AuthorizationRequestEvent', association: :entity
+    Bullet.add_safelist type: :unused_eager_loading, class_name: 'AuthorizationRequestEvent', association: :user
   end
 
   # Settings specified here will take precedence over those in config/application.rb.