diff --git a/config/application.rb b/config/application.rb
index 5cd9e6800a..e31ed459cf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,10 +13,8 @@ class Application < Rails::Application
 
     config.dodona_email = 'dodona@ugent.be'
 
-    # Please, add to the `ignore` list any other `lib` subdirectories that do
-    # not contain `.rb` files, or that should not be reloaded or eager loaded.
-    # Common ones are `templates`, `generators`, or `middleware`, for example.
-    config.autoload_lib(ignore: %w[assets tasks])
+    # Don't eager load the lib directory, this causes issues with the autoloader
+    # config.autoload_lib(ignore: %w[assets tasks])
 
     # Configuration for the application, engines, and railties goes here.
     #
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 72dbee485f..70cf8e1ce4 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -23,8 +23,8 @@
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Do not eager load code on boot.
-  config.eager_load = false
+  # Eager load code on boot.
+  config.eager_load = true
 
   # Show full error reports.
   config.consider_all_requests_local = true