diff --git a/app/services/update_status_expiration_service.rb b/app/services/update_status_expiration_service.rb
index 2dc533c530..8f0b210c36 100644
--- a/app/services/update_status_expiration_service.rb
+++ b/app/services/update_status_expiration_service.rb
@@ -27,6 +27,6 @@ class UpdateStatusExpirationService < BaseService
     expired_at = base_time + due
     expired_status = ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
 
-    RemoveExpiredStatusWorker.perform_at(expired_at, expired_status.id) if due < PostStatusService::MIN_SCHEDULE_OFFSET
+    RemoveExpiredStatusWorker.perform_at(expired_at, expired_status.id) if due < ScheduledStatus::MINIMUM_OFFSET
   end
 end
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index ef68890230..1dccaa18b0 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -31,7 +31,7 @@ class Scheduler::ScheduledStatusesScheduler
   end
 
   def expired_statuses
-    ScheduledExpirationStatus.where(scheduled_at: ..Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
+    ScheduledExpirationStatus.where(scheduled_at: ..time_due_at)
   end
 
   def publish_scheduled_announcements!