diff --git a/Wave/Components/App.razor b/Wave/Components/App.razor
index 4dd2c73..a251d54 100644
--- a/Wave/Components/App.razor
+++ b/Wave/Components/App.razor
@@ -52,6 +52,10 @@
             CookieRequestCultureProvider.MakeCookieValue(
                 new RequestCulture(
                     CultureInfo.CurrentCulture,
-                    CultureInfo.CurrentUICulture)));
+                    CultureInfo.CurrentUICulture)), new CookieOptions {
+	            Expires = DateTimeOffset.UtcNow.AddYears(1), 
+				IsEssential = true, 
+				SameSite = SameSiteMode.Strict
+            });
     }
 }
\ No newline at end of file
diff --git a/Wave/Controllers/LanguageController.cs b/Wave/Controllers/LanguageController.cs
index 0e02503..4ad918b 100644
--- a/Wave/Controllers/LanguageController.cs
+++ b/Wave/Controllers/LanguageController.cs
@@ -11,7 +11,11 @@ public class LanguageController : ControllerBase {
         Response.Cookies.Append(
             CookieRequestCultureProvider.DefaultCookieName,
             CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)),
-            new CookieOptions { Expires = DateTimeOffset.UtcNow.AddYears(1) }
+            new CookieOptions {
+                Expires = DateTimeOffset.UtcNow.AddYears(1), 
+                IsEssential = true, 
+                SameSite = SameSiteMode.Strict
+            }
         );
 
         return LocalRedirect(string.IsNullOrWhiteSpace(returnUrl) ? "/" : returnUrl);