diff --git a/config/deploy.rb b/config/deploy.rb
index d5c75cd1..5cd15706 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -41,7 +41,7 @@ set :rollbar_env, Proc.new { fetch :stage }
 set :rollbar_role, Proc.new { :app }
 
 # Create JS i18n files after precompiling assets
-after 'deploy:assets:precompile', 'deploy:i18n_assets'
+after 'deploy:assets:precompile', 'deploy:i18n_js'
 
 # Restart the app server after successful deploy
 after 'deploy:cleanup', 'deploy:restart'
diff --git a/lib/capistrano/tasks/i18n.rake b/lib/capistrano/tasks/i18n.rake
index 81225d2a..89e64264 100644
--- a/lib/capistrano/tasks/i18n.rake
+++ b/lib/capistrano/tasks/i18n.rake
@@ -1,8 +1,10 @@
 namespace :deploy do
   task :i18n_js do
-    within release_path do
-      with rails_env: fetch(:rails_env), rails_groups: fetch(:rails_assets_groups) do
-        execute :rake, "i18n:js:export"
+    on roles(:all) do
+      within release_path do
+        with rails_env: fetch(:rails_env), rails_groups: fetch(:rails_assets_groups) do
+          execute :rake, "i18n:js:export"
+        end
       end
     end
   end