diff --git a/CHANGES.md b/CHANGES.md
index 16b3aafd8..84c2fd03c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -42,6 +42,7 @@
 - Improved behaviour on text options when not text is selected [Taiga #2390](https://tree.taiga.io/project/penpot/issue/2390)
 - Fix decimal numbers in export viewbox [Taiga #2290](https://tree.taiga.io/project/penpot/issue/2290)
 - Right click over artboard name to open its menu [Taiga #1679](https://tree.taiga.io/project/penpot/issue/1679)
+- Make the default session cookue use SameSite=Lax instead of Strict (causes some issues in latest versions of Chrome).
 
 ### :arrow_up: Deps updates
 
diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj
index f341f91da..e6191cf56 100644
--- a/backend/src/app/http/session.clj
+++ b/backend/src/app/http/session.clj
@@ -58,9 +58,7 @@
     (assoc response :cookies {cookie-name {:path "/"
                                            :http-only true
                                            :value id
-                                           :same-site (cond (not secure?) :lax
-                                                            cors?         :none
-                                                            :else         :strict)
+                                           :same-site (if cors? :none :lax)
                                            :secure secure?}})))
 
 (defn- clear-cookies