diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index b17b928f3..9493bfb32 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -211,7 +211,7 @@ Devise.setup do |config|
 
   # Options to be passed to the created cookie. For instance, you can set
   # secure: true in order to force SSL only cookies.
-  # config.rememberable_options = {}
+  config.rememberable_options = { secure: ApplicationConfig["FORCE_SSL_IN_RAILS"] == "true", same_site: :lax }
 
   # ==> Configuration for :validatable
   # Range for password length.