diff --git a/Capfile b/Capfile
index 335828c06..e47ebb4fd 100644
--- a/Capfile
+++ b/Capfile
@@ -13,7 +13,7 @@ require "whenever/capistrano"
 require "rvm1/capistrano3"
 
 require "capistrano/puma"
-install_plugin Capistrano::Puma
+install_plugin Capistrano::Puma, load_hooks: false
 
 #SCM: Git
 require "capistrano/scm/git"
diff --git a/config/deploy.rb b/config/deploy.rb
index f8c4d00f7..7cd43e03f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -45,8 +45,6 @@ set(:config_files, %w[
 set :whenever_roles, -> { :app }
 
 namespace :deploy do
-  Rake::Task["puma:check"].clear_actions
-
   after :updating, "rvm1:install:rvm"
   after :updating, "rvm1:install:ruby"
   after :updating, "install_bundler_gem"
@@ -55,12 +53,13 @@ namespace :deploy do
   after "deploy:migrate", "add_new_settings"
 
   before :publishing, "smtp_ssl_and_delay_jobs_secrets"
+  after  :publishing, "setup_puma"
 
-  after :publishing, "deploy:restart"
-  after :published, "delayed_job:restart"
-  after :published, "refresh_sitemap"
+  after :published, "deploy:restart"
+  before "deploy:restart", "puma:smart_restart"
+  before "deploy:restart", "delayed_job:restart"
 
-  before "deploy:restart", "setup_puma"
+  after :finished, "refresh_sitemap"
 
   desc "Deploys and runs the tasks needed to upgrade to a new release"
   task :upgrade do