diff --git a/app/models/domain.rb b/app/models/domain.rb
index e20f12933..d60f2b237 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -581,7 +581,7 @@ class Domain < ActiveRecord::Base
       statuses << DomainStatus::SERVER_MANUAL_INZONE
     end
 
-    self.force_delete_at = (Time.zone.now + 31.days).beginning_of_day unless force_delete_at
+    self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day unless force_delete_at
     transaction do
       save!(validate: false)
       registrar.messages.create!(