diff --git a/app/interactions/domains/delete/base.rb b/app/interactions/domains/delete/base.rb
new file mode 100644
index 000000000..434712f72
--- /dev/null
+++ b/app/interactions/domains/delete/base.rb
@@ -0,0 +1,9 @@
+module Domains
+  module Delete
+    class Base < ActiveInteraction::Base
+      object :domain,
+             class: Domain,
+             description: 'Domain to delete'
+    end
+  end
+end
diff --git a/app/interactions/domains/delete/do_delete.rb b/app/interactions/domains/delete/do_delete.rb
new file mode 100644
index 000000000..202c36938
--- /dev/null
+++ b/app/interactions/domains/delete/do_delete.rb
@@ -0,0 +1,13 @@
+module Domains
+  module Delete
+    class DoDelete < Base
+      def execute
+        ::PaperTrail.request.whodunnit = "interaction - #{self.class.name}"
+        WhoisRecord.where(domain_id: domain.id).destroy_all
+
+        domain.destroy
+        compose(Domains::Delete::NotifyRegistrar, inputs)
+      end
+    end
+  end
+end
diff --git a/app/interactions/domains/delete/notify_registrar.rb b/app/interactions/domains/delete/notify_registrar.rb
new file mode 100644
index 000000000..d6af00fd8
--- /dev/null
+++ b/app/interactions/domains/delete/notify_registrar.rb
@@ -0,0 +1,14 @@
+module Domains
+  module Delete
+    class NotifyRegistrar < Base
+      def execute
+        bye_bye = domain.versions.last
+        domain.registrar.notifications.create!(
+          text: "#{I18n.t(:domain_deleted)}: #{domain.name}",
+          attached_obj_id: bye_bye.id,
+          attached_obj_type: bye_bye.class.to_s
+        )
+      end
+    end
+  end
+end
diff --git a/app/jobs/domain_delete_job.rb b/app/jobs/domain_delete_job.rb
index 43e0bb844..5577908c6 100644
--- a/app/jobs/domain_delete_job.rb
+++ b/app/jobs/domain_delete_job.rb
@@ -3,15 +3,6 @@ class DomainDeleteJob < Que::Job
   def run(domain_id)
     domain = Domain.find(domain_id)
 
-    ::PaperTrail.request.whodunnit = "job - #{self.class.name}"
-    WhoisRecord.where(domain_id: domain.id).destroy_all
-
-    domain.destroy
-    bye_bye = domain.versions.last
-    domain.registrar.notifications.create!(
-        text: "#{I18n.t(:domain_deleted)}: #{domain.name}",
-        attached_obj_id: bye_bye.id,
-        attached_obj_type: bye_bye.class.to_s
-    )
+    Domains::Delete::DoDelete.run(domain: domain)
   end
 end
diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
index bd01ab1c9..81518c739 100644
--- a/app/models/concerns/domain/deletable.rb
+++ b/app/models/concerns/domain/deletable.rb
@@ -20,6 +20,6 @@ module Concerns::Domain::Deletable
   end
 
   def deletion_deadline
-    delete_date + 24.hours
+    (delete_date || Time.zone.now) + 24.hours
   end
-end
\ No newline at end of file
+end
diff --git a/test/interactions/domain_delete_interaction/domain_delete_test.rb b/test/interactions/domain_delete_interaction/domain_delete_test.rb
new file mode 100644
index 000000000..9582fae03
--- /dev/null
+++ b/test/interactions/domain_delete_interaction/domain_delete_test.rb
@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class DomainDeleteTest < ActiveSupport::TestCase
+  setup do
+    @domain = domains(:shop)
+  end
+
+  def test_discards_domains_with_past_delete_date
+    @domain.update!(delete_date: '2010-07-04')
+    travel_to Time.zone.parse('2010-07-05')
+
+    Domains::Delete::DoDelete.run(domain: @domain)
+
+    assert @domain.destroyed?
+  end
+
+  def test_sends_notification
+    @domain.update!(delete_date: '2010-07-04')
+    travel_to Time.zone.parse('2010-07-05')
+
+    assert_difference '@domain.registrar.notifications.count', 1 do
+      Domains::Delete::DoDelete.run(domain: @domain)
+    end
+  end
+end