diff --git a/app/models/doorkeeper/access_grant.rb b/app/models/doorkeeper/access_grant.rb
new file mode 100644
index 000000000..03620d78e
--- /dev/null
+++ b/app/models/doorkeeper/access_grant.rb
@@ -0,0 +1,7 @@
+module Doorkeeper
+  class AccessGrant < ::ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
+    include Models::ExpirationTimeSqlMath
+
+    scope :expired, -> { where.not(expires_in: nil).where("#{sanitize_sql(expiration_time_sql)} < ?", Time.current) }
+  end
+end
diff --git a/app/models/doorkeeper/access_token.rb b/app/models/doorkeeper/access_token.rb
index 2bb5e8d40..5f0d7319d 100644
--- a/app/models/doorkeeper/access_token.rb
+++ b/app/models/doorkeeper/access_token.rb
@@ -2,6 +2,7 @@ module Doorkeeper
   class AccessToken < ::ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
     scope :not_revoked, -> { where(revoked_at: nil) }
     scope :expires_after, ->(time) { where.not(expires_in: nil).where("#{sanitize_sql(expiration_time_sql)} > ?", time) }
+    scope :expired, -> { where.not(expires_in: nil).where("#{sanitize_sql(expiration_time_sql)} < ?", Time.current) }
     scope :ordered_by_expires_at, -> { order(expiration_time_sql) }
     scope :ordered_by_application_name, -> { includes(:application).merge(Doorkeeper::Application.ordered_by_name) }
   end
diff --git a/lib/expired_oauth_access_records_deleter.rb b/lib/expired_oauth_access_records_deleter.rb
index 552d2d39a..b26b60a12 100644
--- a/lib/expired_oauth_access_records_deleter.rb
+++ b/lib/expired_oauth_access_records_deleter.rb
@@ -8,8 +8,6 @@ class ExpiredOauthAccessRecordsDeleter
     access_token: EventLog::ACCESS_TOKENS_DELETED,
   }.freeze
 
-  HAS_EXPIRED = "expires_in is not null AND DATE_ADD(created_at, INTERVAL expires_in second) < ?".freeze
-
   def initialize(record_type:)
     @record_class = CLASSES.fetch(record_type)
     @event = EVENTS.fetch(record_type)
@@ -19,7 +17,7 @@ def initialize(record_type:)
   attr_reader :record_class, :total_deleted
 
   def delete_expired
-    @record_class.where(HAS_EXPIRED, Time.zone.now).in_batches do |relation|
+    @record_class.expired.in_batches do |relation|
       records_by_user_id = relation.includes(:application).group_by(&:resource_owner_id)
       all_users = User.where(id: records_by_user_id.keys)
 
diff --git a/test/models/doorkeeper/access_grant_test.rb b/test/models/doorkeeper/access_grant_test.rb
new file mode 100644
index 000000000..c9fbaafeb
--- /dev/null
+++ b/test/models/doorkeeper/access_grant_test.rb
@@ -0,0 +1,15 @@
+require "test_helper"
+
+class Doorkeeper::AccessGrantTest < ActiveSupport::TestCase
+  context ".expired" do
+    should "return grants that have expired" do
+      grant_expiring_1_day_ago = create(:access_grant, expires_in: -1.day)
+      grant_expiring_in_1_day = create(:access_grant, expires_in: 1.day)
+
+      grants = Doorkeeper::AccessGrant.expired
+
+      assert_includes grants, grant_expiring_1_day_ago
+      assert_not_includes grants, grant_expiring_in_1_day
+    end
+  end
+end
diff --git a/test/models/doorkeeper/access_token_test.rb b/test/models/doorkeeper/access_token_test.rb
index 827f018f9..7bed84a85 100644
--- a/test/models/doorkeeper/access_token_test.rb
+++ b/test/models/doorkeeper/access_token_test.rb
@@ -25,6 +25,18 @@ class Doorkeeper::AccessTokenTest < ActiveSupport::TestCase
     end
   end
 
+  context ".expired" do
+    should "return tokens that have expired" do
+      token_expiring_1_day_ago = create(:access_token, expires_in: -1.day)
+      token_expiring_in_1_day = create(:access_token, expires_in: 1.day)
+
+      tokens = Doorkeeper::AccessToken.expired
+
+      assert_includes tokens, token_expiring_1_day_ago
+      assert_not_includes tokens, token_expiring_in_1_day
+    end
+  end
+
   context ".ordered_by_expires_at" do
     should "return tokens ordered by expiry time" do
       token_expiring_in_2_weeks = create(:access_token, expires_in: 2.weeks)