diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 1a8a71a07..03a517df8 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -3,6 +3,8 @@ import moment from 'moment';
 import Cookies from 'js-cookie';
 import { frontendURL } from '../../helper/URLHelper';
 
+Cookies.defaults = { sameSite: 'Lax' };
+
 export const getLoadingStatus = state => state.fetchAPIloadingStatus;
 export const setLoadingStatus = (state, status) => {
   state.fetchAPIloadingStatus = status;
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index dbb766290..9d0d1f35b 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_chatwoot_session'
+Rails.application.config.session_store :cookie_store, key: '_chatwoot_session', same_site: :lax