diff --git a/config/environments/development.rb b/config/environments/development.rb
index 20310726cb..3e74942275 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,8 +9,7 @@ Openfoodnetwork::Application.configure do
   # :file_store is used by default when no cache store is specifically configured.
   # config.cache_store = :file_store
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 91ff62a3be..4ab5a11dd4 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,6 +1,8 @@
 Openfoodnetwork::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.eager_load = false
+
   # Code is not reloaded between requests
   config.cache_classes = true
 
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 91ff62a3be..4ab5a11dd4 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,6 +1,8 @@
 Openfoodnetwork::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.eager_load = false
+
   # Code is not reloaded between requests
   config.cache_classes = true