diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index d0a4c113ad0..98b6bbacacf 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -40,7 +40,7 @@ class ScopeError < RuntimeError; end
 
   def self.expire_all!
     transaction do
-      find_each.all?(&:expire!)
+      unexpired.find_each.all?(&:expire!)
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 69be1896d66..96007086007 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -310,7 +310,7 @@ def toxic_email_domain
   end
 
   def expire_all_api_keys
-    api_keys.unexpired.expire_all!
+    api_keys.expire_all!
   end
 
   def destroy_associations_for_discard