diff --git a/app/interactions/domains/force_delete/notify_by_email.rb b/app/interactions/domains/force_delete/notify_by_email.rb
index e512657b0..0e704ee99 100644
--- a/app/interactions/domains/force_delete/notify_by_email.rb
+++ b/app/interactions/domains/force_delete/notify_by_email.rb
@@ -4,6 +4,7 @@ module Domains
       def execute
         return unless notify_by_email
 
+        domain.skip_whois_record_update = false
         if type == :fast_track
           send_email
           domain.update(contact_notification_sent_date: Time.zone.today)
diff --git a/app/interactions/domains/force_delete/post_set_process.rb b/app/interactions/domains/force_delete/post_set_process.rb
index 61df9ef46..036fd3531 100644
--- a/app/interactions/domains/force_delete/post_set_process.rb
+++ b/app/interactions/domains/force_delete/post_set_process.rb
@@ -11,7 +11,7 @@ module Domains
 
         # Allow deletion
         statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
-        domain.skip_whois_record_update = false
+        domain.skip_whois_record_update = notify_by_email ? true : false
 
         domain.save(validate: false)
       end