diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb
index ffa8eb5d..b2f40e53 100644
--- a/config/initializers/locomotive.rb
+++ b/config/initializers/locomotive.rb
@@ -38,9 +38,11 @@ Locomotive.configure do |config|
   #   :password   => '<your_heroku_password>'
   # }
 
-  # Locomotive uses the DelayedJob gem for the theme import module.
+  # Locomotive uses the DelayedJob gem for the site import module.
   # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
   # If you do not mind about importing theme without DelayedJob, disable it.
+  #
+  # Warning: this option is not used if you deploy on bushi.do and we set automatically the value to true.
   config.delayed_job = false
 
   # configure how many items we display in sub menu in the "Contents" section.
diff --git a/lib/generators/locomotive/install/templates/locomotive.rb b/lib/generators/locomotive/install/templates/locomotive.rb
index 69112b4d..fadfe4df 100644
--- a/lib/generators/locomotive/install/templates/locomotive.rb
+++ b/lib/generators/locomotive/install/templates/locomotive.rb
@@ -36,9 +36,11 @@ Locomotive.configure do |config|
   #   :password   => '<your_heroku_password>'
   # }
 
-  # Locomotive uses the DelayedJob gem for the theme import module.
+  # Locomotive uses the DelayedJob gem for the site import module.
   # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
   # If you do not mind about importing theme without DelayedJob, disable it.
+  #
+  # Warning: this option is not used if you deploy on bushi.do and we set automatically the value to true.
   config.delayed_job = false
 
   # configure how many items we display in sub menu in the "Contents" section.
diff --git a/lib/locomotive/configuration.rb b/lib/locomotive/configuration.rb
index f9461e03..1c34ed81 100644
--- a/lib/locomotive/configuration.rb
+++ b/lib/locomotive/configuration.rb
@@ -11,7 +11,7 @@ module Locomotive
       :cookie_key             => '_locomotive_session',
       :enable_logs            => false,
       :hosting                => :auto,
-      :delayed_job            => true,
+      :delayed_job            => false,
       :default_locale         => :en,
       :mailer_sender          => 'support', #support@example.com'
       :manage_subdomain       => false,
diff --git a/lib/locomotive/hosting/bushido.rb b/lib/locomotive/hosting/bushido.rb
index 166d05de..8a30623d 100644
--- a/lib/locomotive/hosting/bushido.rb
+++ b/lib/locomotive/hosting/bushido.rb
@@ -29,6 +29,8 @@ module Locomotive
 
           self.setup_smtp_settings
 
+          self.config.delayed_job = true # force the use of delayed_job
+
           self.bushido_domains = ::Bushido::App.domains
           self.bushido_subdomain = ::Bushido::App.subdomain
         end