diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8d3a7d0f6..666622309 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -54,6 +54,9 @@ Diaspora::Application.configure do
   # Enable threaded mode
   config.threadsafe!
 
+  # Enable autoload for rake tasks
+  config.dependency_loading = true if $rails_rake_task
+
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true