diff --git a/app/interactions/domains/force_delete_email/base.rb b/app/interactions/domains/force_delete_email/base.rb
index af048d48f..291dcd136 100644
--- a/app/interactions/domains/force_delete_email/base.rb
+++ b/app/interactions/domains/force_delete_email/base.rb
@@ -12,16 +12,20 @@ module Domains
                   Domain.where(registrant_id: registrant_ids)
 
         domains.each do |domain|
-          if domain.force_delete_scheduled? && !domain.status_notes[DomainStatus::FORCE_DELETE].nil?
-            added_additional_email_into_notes(domain)
-          else
-            process_force_delete(domain)
-          end
+          before_execute_force_delete(domain)
         end
       end
 
       private
 
+      def before_execute_force_delete(domain)
+        if domain.force_delete_scheduled? && !domain.status_notes[DomainStatus::FORCE_DELETE].nil?
+          added_additional_email_into_notes(domain)
+        else
+          process_force_delete(domain)
+        end
+      end
+
       def process_force_delete(domain)
         domain.schedule_force_delete(type: :soft,
                                      notify_by_email: true,
@@ -31,10 +35,10 @@ module Domains
       end
 
       def added_additional_email_into_notes(domain)
-        unless domain.status_notes[DomainStatus::FORCE_DELETE].include? email
-          domain.status_notes[DomainStatus::FORCE_DELETE].concat(' ' + email)
-          domain.save(validate: false)
-        end
+        return if domain.status_notes[DomainStatus::FORCE_DELETE].include? email
+
+        domain.status_notes[DomainStatus::FORCE_DELETE].concat(' ' + email)
+        domain.save(validate: false)
       end
 
       def save_status_note(domain)
diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
index 246a029cf..1ee0bc77e 100644
--- a/test/models/domain/force_delete_test.rb
+++ b/test/models/domain/force_delete_test.rb
@@ -414,8 +414,6 @@ class ForceDeleteTest < ActionMailer::TestCase
     assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
     assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one
     assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two
-    notification = @domain.registrar.notifications.last
-    assert notification.text.include? asserted_text
   end
 
   def test_lifts_force_delete_if_contact_fixed