diff --git a/internal/api/session.go b/internal/api/session.go
index 89fb787e..a9f67a37 100644
--- a/internal/api/session.go
+++ b/internal/api/session.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"net/http"
+	"os"
 	"time"
 
 	"demodesk/neko/internal/http/auth"
@@ -9,6 +10,9 @@ import (
 	"demodesk/neko/internal/utils"
 )
 
+var CookieExpirationDate = time.Now().Add(365 * 24 * time.Hour)
+var UnsecureCookies = os.Getenv("DISABLE_SECURE_COOKIES") == "true"
+
 type SessionLoginPayload struct {
 	ID     string `json:"id"`
 	Secret string `json:"secret"`
@@ -32,17 +36,26 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	sameSite := http.SameSiteNoneMode
+	if UnsecureCookies {
+		sameSite = http.SameSiteDefaultMode
+	}
+
 	http.SetCookie(w, &http.Cookie{
 		Name:     "neko-id",
 		Value:    session.ID(),
-		Expires:  time.Now().Add(365 * 24 * time.Hour),
+		Expires:  CookieExpirationDate,
+		Secure:   !UnsecureCookies,
+		SameSite: sameSite,
 		HttpOnly: false,
 	})
 
 	http.SetCookie(w, &http.Cookie{
 		Name:     "neko-secret",
 		Value:    data.Secret,
-		Expires:  time.Now().Add(365 * 24 * time.Hour),
+		Expires:  CookieExpirationDate,
+		Secure:   !UnsecureCookies,
+		SameSite: sameSite,
 		HttpOnly: true,
 	})
 
@@ -54,10 +67,17 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
 }
 
 func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) {
+	sameSite := http.SameSiteNoneMode
+	if UnsecureCookies {
+		sameSite = http.SameSiteDefaultMode
+	}
+
 	http.SetCookie(w, &http.Cookie{
 		Name:     "neko-id",
 		Value:    "",
 		Expires:  time.Unix(0, 0),
+		Secure:   !UnsecureCookies,
+		SameSite: sameSite,
 		HttpOnly: false,
 	})
 
@@ -65,6 +85,8 @@ func (api *ApiManagerCtx) Logout(w http.ResponseWriter, r *http.Request) {
 		Name:     "neko-secret",
 		Value:    "",
 		Expires:  time.Unix(0, 0),
+		Secure:   !UnsecureCookies,
+		SameSite: sameSite,
 		HttpOnly: true,
 	})