diff --git a/server/index.ts b/server/index.ts
index b426f0f3..10ca1032 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -152,7 +152,7 @@ app
         cookie: {
           maxAge: 1000 * 60 * 60 * 24 * 30,
           httpOnly: true,
-          sameSite: true,
+          sameSite: settings.main.csrfProtection ? 'strict' : 'lax',
           secure: 'auto',
         },
         store: new TypeormStore({