diff --git a/app/lib/request.rb b/app/lib/request.rb
index 81e59fb2ec..cc741f212d 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -295,7 +295,7 @@ class Request
           Resolv::DNS.open do |dns|
             dns.timeouts = 5
             addresses = dns.getaddresses(host)
-            addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
+            addresses = addresses.grep(Resolv::IPv6).take(2) + addresses.grep_v(Resolv::IPv6).take(2)
           end
         end
 
diff --git a/spec/requests/activitypub/replies_spec.rb b/spec/requests/activitypub/replies_spec.rb
index 02832c049a..95bc1afe61 100644
--- a/spec/requests/activitypub/replies_spec.rb
+++ b/spec/requests/activitypub/replies_spec.rb
@@ -252,13 +252,13 @@ RSpec.describe 'ActivityPub Replies' do
   def inlined_replies
     response
       .parsed_body[:first][:items]
-      .select { |x| x.is_a?(Hash) }
+      .grep(Hash)
   end
 
   def remote_replies
     response
       .parsed_body[:first][:items]
-      .reject { |x| x.is_a?(Hash) }
+      .grep_v(Hash)
   end
 
   def parsed_uri_query_values(uri)