diff --git a/config/environments/production.rb b/config/environments/production.rb
index 16d8c8e84..6262b8782 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -118,7 +118,7 @@ Rails.application.configure do
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE").to_sym
+  config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE", 'local').to_sym
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
@@ -174,5 +174,5 @@ Rails.application.configure do
   # The Content-Security-Policy is NOT in Report-Only mode
   config.content_security_policy_report_only = false
 
-  config.lograge.enabled = ENV['LOGRAGE_ENABLED'] == 'enabled'
+  config.lograge.enabled = ENV.fetch('LOGRAGE_ENABLED', 'disabled') == 'enabled'
 end

diff --git a/config/initializers/mailcatcher.rb b/config/initializers/mailcatcher.rb
index 8b931f704..dbeceb4ec 100644
--- a/config/initializers/mailcatcher.rb
+++ b/config/initializers/mailcatcher.rb
@@ -1,4 +1,4 @@
-if ENV.fetch('MAILCATCHER_ENABLED') == 'enabled'
+if ENV.fetch('MAILCATCHER_ENABLED', 'disabled') == 'enabled'
   ActiveSupport.on_load(:action_mailer) do
     module Mailcatcher
       class SMTP < ::Mail::SMTP; end

diff --git a/config/initializers/mailtrap.rb b/config/initializers/mailtrap.rb
index 6d1faa04b..658673ed1 100644
--- a/config/initializers/mailtrap.rb
+++ b/config/initializers/mailtrap.rb
@@ -1,4 +1,4 @@
-if ENV.fetch('MAILTRAP_ENABLED') == 'enabled'
+if ENV.fetch('MAILTRAP_ENABLED', 'disabled') == 'enabled'
   ActiveSupport.on_load(:action_mailer) do
     module Mailtrap
       class SMTP < ::Mail::SMTP; end