diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 7862dccc2..3fe74cba6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -155,7 +155,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 = ENV['user_session_timeout']
+  config.timeout_in = ENV['user_session_timeout'].to_i.seconds if ENV['user_session_timeout']
 
   # If true, expires auth token on session timeout.
   # config.expire_auth_token_on_timeout = false