diff --git a/src/components/Config/ConfigChanger.tsx b/src/components/Config/ConfigChanger.tsx
index 5b8836803..fa4920242 100644
--- a/src/components/Config/ConfigChanger.tsx
+++ b/src/components/Config/ConfigChanger.tsx
@@ -26,7 +26,7 @@ export default function ConfigChanger() {
       label="Config loader"
       onChange={(e) => {
         loadConfig(e ?? 'default');
-        setCookies('config-name', e ?? 'default', { maxAge: 60 * 60 * 24 * 30 });
+        setCookies('config-name', e ?? 'default', { maxAge: 60 * 60 * 24 * 30, sameSite: 'strict' });
       }}
       data={
         // If config list is empty, return the current config
diff --git a/src/components/Config/LoadConfig.tsx b/src/components/Config/LoadConfig.tsx
index 1dbed5988..e98550b6a 100644
--- a/src/components/Config/LoadConfig.tsx
+++ b/src/components/Config/LoadConfig.tsx
@@ -90,7 +90,10 @@ export default function LoadConfigComponent(props: any) {
             icon: <Check />,
             message: undefined,
           });
-          setCookies('config-name', newConfig.name, { maxAge: 60 * 60 * 24 * 30 });
+          setCookies('config-name', newConfig.name, {
+            maxAge: 60 * 60 * 24 * 30,
+            sameSite: 'strict',
+          });
           const migratedConfig = migrateToIdConfig(newConfig);
           setConfig(migratedConfig);
         });
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index b6042106b..0f5ca4375 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -43,7 +43,7 @@ export default function AuthenticationTitle() {
           onSubmit={form.onSubmit((values) => {
             setCookies('password', values.password, {
               maxAge: 60 * 60 * 24 * 30,
-              sameSite: 'strict',
+              sameSite: 'lax',
             });
             showNotification({
               id: 'load-data',