diff --git a/app/jobs/domain_expire_email_job.rb b/app/jobs/domain_expire_email_job.rb
index 100b0e8af..1aad4aed9 100644
--- a/app/jobs/domain_expire_email_job.rb
+++ b/app/jobs/domain_expire_email_job.rb
@@ -1,7 +1,8 @@
 class DomainExpireEmailJob < ApplicationJob
   def perform(domain_id, email)
-    domain = Domain.find(domain_id)
+    domain = Domain.find_by(id: domain_id)
 
+    return if domain.blank?
     return if domain.registered?
 
     attrs = {
diff --git a/lib/tasks/migrate_jobs.rake b/lib/tasks/migrate_jobs.rake
index 687187c54..a5a4b5bcf 100644
--- a/lib/tasks/migrate_jobs.rake
+++ b/lib/tasks/migrate_jobs.rake
@@ -18,12 +18,14 @@ namespace :migrate_jobs do
     else
       args = que_job.args
       time = que_job.run_at
+      time = Time.zone.now + 1.minute if time < Time.zone.now
 
-      que_job.job_class.constantize.set(wait_until: time).perform_later(args)
+      que_job.job_class.constantize.set(wait_until: time).perform_later(*args)
     end
   end
 
   def skip_condition(que_job)
-    que_job.last_error.present? || !(que_job.job_class.constantize < ApplicationJob)
+    que_job.last_error.present? || !(que_job.job_class.constantize < ApplicationJob) ||
+      !(que_job.job_class == 'DomainExpireEmailJob')
   end
 end