diff --git a/user-settings.go b/user-settings.go
index 8056287..83fee6c 100755
--- a/user-settings.go
+++ b/user-settings.go
@@ -46,25 +46,25 @@ func saveUserSettings(w http.ResponseWriter, settings UserSettings) {
 		Name:     "theme",
 		Value:    settings.Theme,
 		Path:     "/",
-		Expires:  expiration,            // Expiration time needs to be set otherwise it will expire immediately
-		Secure:   true,                  // Ensure cookie is sent over HTTPS only
-		SameSite: http.SameSiteNoneMode, // Set SameSite to None
+		Expires:  expiration, // Expiration time needs to be set otherwise it will expire immediately
+		Secure:   true,       // Ensure cookie is sent over HTTPS only
+		SameSite: http.SameSiteStrictMode,
 	})
 	http.SetCookie(w, &http.Cookie{
 		Name:     "language",
 		Value:    settings.Language,
 		Path:     "/",
 		Expires:  expiration,
-		Secure:   true,                  // Ensure cookie is sent over HTTPS only
-		SameSite: http.SameSiteNoneMode, // Set SameSite to None
+		Secure:   true,
+		SameSite: http.SameSiteStrictMode,
 	})
 	http.SetCookie(w, &http.Cookie{
 		Name:     "safe",
 		Value:    settings.SafeSearch,
 		Path:     "/",
 		Expires:  expiration,
-		Secure:   true,                  // Ensure cookie is sent over HTTPS only
-		SameSite: http.SameSiteNoneMode, // Set SameSite to None
+		Secure:   true,
+		SameSite: http.SameSiteStrictMode,
 	})
 
 	printDebug("settings saved: %v", settings)