diff --git a/config/deploy.rb b/config/deploy.rb
index 8c53126e2c3..4f44aeb185c 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -45,6 +45,9 @@ def deploysecret(key)
 set :whenever_roles, -> { :app }
 
 namespace :deploy do
+  Rake::Task["delayed_job:default"].clear_actions
+  Rake::Task["puma:smart_restart"].clear_actions
+
   after :updating, "rvm1:install:rvm"
   after :updating, "rvm1:install:ruby"
   after :updating, "install_bundler_gem"
@@ -54,8 +57,9 @@ def deploysecret(key)
   after  :publishing, "setup_puma"
 
   after :published, "deploy:restart"
-  before "deploy:restart", "puma:smart_restart"
+  before "deploy:restart", "puma:restart"
   before "deploy:restart", "delayed_job:restart"
+  before "deploy:restart", "puma:start"
 
   after :finished, "refresh_sitemap"