diff --git a/Changes.md b/Changes.md
index 11f5df37..93a262dc 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,5 +1,10 @@
 # Sidekiq Changes
 
+4.2.5
+-----------
+
+- Re-enable eager loading of all code when running non-development Rails 5. [#3203]
+
 4.2.4
 -----------
 
diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
index 66ba2033..bf2412dc 100644
--- a/lib/sidekiq/cli.rb
+++ b/lib/sidekiq/cli.rb
@@ -229,8 +229,9 @@ module Sidekiq
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
           ::Rails.application.eager_load!
-        elsif ::Rails::VERSION::MAJOR == 4
+        elsif ::Rails::VERSION::MAJOR >= 4 && environment != 'development'
           # Painful contortions, see 1791 for discussion
+          # No autoloading, we want to force eager load for everything.
           require File.expand_path("#{options[:require]}/config/application.rb")
           ::Rails::Application.initializer "sidekiq.eager_load" do
             ::Rails.application.config.eager_load = true
@@ -238,6 +239,7 @@ module Sidekiq
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
         else
+          # Rails 5+ && development mode, use Reloader
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
         end