diff --git a/config/environments/production.rb b/config/environments/production.rb
index e5cb01151fc2eed5214a79850ac63b5d184e17e8..09b77654f331b4f49f4487eaa8fd31d947d60e4f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -80,6 +80,4 @@ Rails.application.configure do
   }
 
   config.action_mailer.delivery_method = :smtp
-
-  config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
 end
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 3cb17c7181fe9f3a4354ee9a6e4eaed6abaf2645..6aada2c32cdb8e0cd96b1acb1c32a3e91e631ca0 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -4,4 +4,8 @@ Rails.application.configure do
   config.x.use_https    = ENV['LOCAL_HTTPS'] == 'true'
 
   config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://' }
+
+  if Rails.env.production?
+    config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
+  end
 end