diff --git a/activerecord/lib/active_record/relation/record_fetch_warning.rb b/activerecord/lib/active_record/relation/record_fetch_warning.rb
index 0a1814b3dd..dbd08811fa 100644
--- a/activerecord/lib/active_record/relation/record_fetch_warning.rb
+++ b/activerecord/lib/active_record/relation/record_fetch_warning.rb
@@ -24,9 +24,7 @@ module ActiveRecord
       end
 
       # :stopdoc:
-      ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
-        payload = args.last
-
+      ActiveSupport::Notifications.subscribe("sql.active_record") do |*, payload|
         QueryRegistry.queries << payload[:sql]
       end
       # :startdoc:
@@ -34,14 +32,14 @@ module ActiveRecord
       class QueryRegistry # :nodoc:
         extend ActiveSupport::PerThreadRegistry
 
-        attr_accessor :queries
+        attr_reader :queries
 
         def initialize
-          reset
+          @queries = []
         end
 
         def reset
-          @queries = []
+          @queries.clear
         end
       end
     end