diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c2f89e691..56791c45d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -173,7 +173,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
+  config.timeout_in = ENV['user_session_timeout'].to_i.seconds if ENV['user_session_timeout']
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.