diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 8ff0b8bed..4c858affb 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,10 +1,13 @@
 # We have had lots of config issues with SECRET_TOKEN to avoid this mess we are moving it to redis
 #  if you feel strongly that it does not belong there use ENV['SECRET_TOKEN']
 #
-token = ENV['SECRET_TOKEN'] || $redis.get('SECRET_TOKEN')
-unless token && token.length == 128
-  token = SecureRandom.hex(64)
-  $redis.set('SECRET_TOKEN',token)
+token = ENV['SECRET_TOKEN']
+unless token
+  token = $redis.get('SECRET_TOKEN')
+  unless token && token.length == 128
+    token = SecureRandom.hex(64)
+    $redis.set('SECRET_TOKEN',token)
+  end
 end
 
 Discourse::Application.config.secret_token = token