diff --git a/config/environments/production.rb b/config/environments/production.rb
index 88c743071a..229221e118 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -30,9 +30,6 @@ Openfoodnetwork::Application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = true
 
-  # Use https when creating links in emails
-  config.action_mailer.default_url_options = { protocol: 'https', host: Spree::Config[:site_url] }
-
   # See everything in the log (default is :info)
   config.log_level = :info
 
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index f43d42f998..303d7d2913 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -30,9 +30,6 @@ Openfoodnetwork::Application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = true
 
-  # Use https when creating links in emails
-  config.action_mailer.default_url_options = { protocol: 'https', host: Spree::Config[:site_url] }
-
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
new file mode 100644
index 0000000000..cd2a638567
--- /dev/null
+++ b/config/initializers/action_mailer.rb
@@ -0,0 +1,6 @@
+ActionMailer::Base.configure do |config|
+  if Rails.env.production? || Rails.env.staging?
+    # Use https when creating links in emails
+    config.default_url_options = { protocol: 'https', host: Spree::Config[:site_url] }
+  end
+end