diff --git a/app/interactions/domains/force_delete/set_status.rb b/app/interactions/domains/force_delete/set_status.rb
index 80f37b23b..b0a53ad82 100644
--- a/app/interactions/domains/force_delete/set_status.rb
+++ b/app/interactions/domains/force_delete/set_status.rb
@@ -16,7 +16,7 @@ module Domains
 
       def force_delete_soft
         years = (domain.valid_to.to_date - Time.zone.today).to_i / 365
-        years.positive? ? soft_forcedelete_dates(years) : set_less_than_year_until_valid_to_date
+        soft_forcedelete_dates(years) if years.positive?
       end
 
       private
@@ -24,19 +24,12 @@ module Domains
       def soft_forcedelete_dates(years)
         domain.force_delete_start = domain.valid_to - years.years
         domain.force_delete_date = domain.force_delete_start +
-                                   expire_warning_period_days +
-                                   redemption_grace_period_days
-      end
-
-      def set_less_than_year_until_valid_to_date
-        domain.force_delete_start = domain.valid_to
-        domain.force_delete_date = domain.force_delete_start +
-                                   expire_warning_period_days +
-                                   redemption_grace_period_days
+                                   Setting.expire_warning_period.days +
+                                   Setting.redemption_grace_period.days
       end
 
       def redemption_grace_period_days
-        Setting.redemption_grace_period.days
+        Setting.redemption_grace_period.days + 1.day
       end
 
       def expire_warning_period_days
diff --git a/app/jobs/outzone_invalid_email_domains_job.rb b/app/jobs/outzone_invalid_email_domains_job.rb
index 03f7e5f64..95da4944b 100644
--- a/app/jobs/outzone_invalid_email_domains_job.rb
+++ b/app/jobs/outzone_invalid_email_domains_job.rb
@@ -3,7 +3,6 @@ class OutzoneInvalidEmailDomainsJob < ApplicationJob
 
   def perform
     domains = Domain.where("force_delete_data->'template_name' = ?", 'invalid_email')
-                    .where("force_delete_data->'force_delete_type' = ?", 'soft')
                     .where(outzone_at: nil)
                     .where('Date(force_delete_start) <= ?', Time.zone.now)
 
diff --git a/test/interactions/force_delete_email/base_test.rb b/test/interactions/force_delete_email/base_test.rb
index 5ae37185b..ffca7b3c5 100644
--- a/test/interactions/force_delete_email/base_test.rb
+++ b/test/interactions/force_delete_email/base_test.rb
@@ -20,25 +20,6 @@ class BaseTest < ActiveSupport::TestCase
     assert_not @domain.force_delete_scheduled?
   end
 
-  def test_less_than_year_until_valid_to_date
-    refute @domain_airport.force_delete_scheduled?
-    @domain_airport.update!(valid_to: Time.zone.now + 11.months)
-    @domain_airport.reload
-    prepare_contact
-
-    contact = @domain_airport.admin_contacts.first
-
-    Domains::ForceDeleteEmail::Base.run(email: contact.email)
-    @domain_airport.reload
-
-    assert @domain_airport.force_delete_scheduled?
-    assert @domain_airport.valid_to < Time.zone.now + 1.year
-    assert_equal @domain_airport.force_delete_start, @domain_airport.valid_to
-    assert_equal @domain_airport.force_delete_date, (@domain_airport.force_delete_start +
-                                                    Setting.expire_warning_period.days +
-                                                    Setting.redemption_grace_period.days).to_date
-  end
-
   def test_more_that_year_until_valid_to_date
     refute @domain_airport.force_delete_scheduled?
     @domain_airport.update!(valid_to: Time.zone.now + 3.years + 1.month + 1.day)
diff --git a/test/jobs/outzone_invalid_email_domains_job_test.rb b/test/jobs/outzone_invalid_email_domains_job_test.rb
index c50638829..dd7ce41c2 100644
--- a/test/jobs/outzone_invalid_email_domains_job_test.rb
+++ b/test/jobs/outzone_invalid_email_domains_job_test.rb
@@ -20,10 +20,6 @@ class OutzoneInvalidEmailDomainsJobTest < ActiveJob::TestCase
 
     assert @domain.force_delete_scheduled?
     assert @domain.valid_to < Time.zone.now + 1.year
-    assert_equal @domain.force_delete_start, @domain.valid_to
-    assert_equal @domain.force_delete_date, (@domain.force_delete_start +
-                                                    Setting.expire_warning_period.days +
-                                                    Setting.redemption_grace_period.days).to_date
     assert_equal @domain.outzone_at, @domain.force_delete_start + Setting.expire_warning_period.day
   end