diff --git a/Library/Homebrew/dev-cmd/unbottled.rb b/Library/Homebrew/dev-cmd/unbottled.rb
index 3d0f0cec0f..c29a027f71 100644
--- a/Library/Homebrew/dev-cmd/unbottled.rb
+++ b/Library/Homebrew/dev-cmd/unbottled.rb
@@ -158,10 +158,6 @@ module Homebrew
 
     formulae.each do |f|
       name = f.name.downcase
-      if f.bottle_specification.tag?(@bottle_tag, no_older_versions: true)
-        puts "#{Tty.bold}#{Tty.green}#{name}#{Tty.reset}: already bottled" if any_named_args
-        next
-      end
 
       if f.disabled?
         puts "#{Tty.bold}#{Tty.green}#{name}#{Tty.reset}: formula disabled" if any_named_args
@@ -190,11 +186,7 @@ module Homebrew
 
             Version.new(MacOS::Xcode.latest_version(macos: macos_version)) >= r.version
           when ArchRequirement
-            arch = r.arch
-            arch = :intel if arch == :x86_64
-            arch = :arm64 if arch == :arm
-
-            arch == macos_version.arch
+            r.arch == @bottle_tag.arch
           else
             true
           end
@@ -215,6 +207,11 @@ module Homebrew
         next
       end
 
+      if f.bottle_specification.tag?(@bottle_tag, no_older_versions: true)
+        puts "#{Tty.bold}#{Tty.green}#{name}#{Tty.reset}: already bottled" if any_named_args
+        next
+      end
+
       deps = Array(deps_hash[f.name]).reject do |dep|
         dep.bottle_specification.tag?(@bottle_tag, no_older_versions: true) || dep.bottle_unneeded?
       end