diff --git a/Pages/Conference.cshtml b/Pages/Conference.cshtml
index 5fa4337..31fa9cc 100644
--- a/Pages/Conference.cshtml
+++ b/Pages/Conference.cshtml
@@ -8,7 +8,7 @@
         return;
     }
 
-    c3stream.UpdateCookie(Request, Response, $"/Conference?c={Request.Query["c"]}&");
+    c3stream.UpdateCookie(Request, Response, $"/Conference?c={Request.Query["c"]}");
     ReadUserData();
     ViewData["Title"] = Request.Query["c"];
     var wc = new WebClient();
diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
index 8a22bd6..b8ef1d2 100644
--- a/Pages/Index.cshtml
+++ b/Pages/Index.cshtml
@@ -2,7 +2,7 @@
 @model IndexModel
 @{
     ViewData["Title"] = "Home";
-    c3stream.UpdateCookie(Request, Response, "/?");
+    c3stream.UpdateCookie(Request, Response, "/");
 }
 
 <div style="text-align: center">
diff --git a/Pages/Info.cshtml b/Pages/Info.cshtml
index 95328a3..234321c 100644
--- a/Pages/Info.cshtml
+++ b/Pages/Info.cshtml
@@ -9,7 +9,7 @@
         return;
     }
 
-    c3stream.UpdateCookie(Request, Response, $"/Info?guid={Request.Query["guid"]}&");
+    c3stream.UpdateCookie(Request, Response, $"/Info?guid={Request.Query["guid"]}");
 
     ConferenceModel.ReadUserData();
     var talk = c3stream.GetEventByGuid(Request.Query["guid"]);
diff --git a/c3stream.cs b/c3stream.cs
index 6d6b6ab..23ced2e 100644
--- a/c3stream.cs
+++ b/c3stream.cs
@@ -82,20 +82,15 @@ namespace c3stream {
 
 		public static void UpdateCookie(HttpRequest request, HttpResponse response, string redirectUri) {
 			//if new bookmark is in uri
-			if (request.Query.ContainsKey("bookmark") && request.Cookies["bookmark"] != request.Query["bookmark"]) {
+			if (request.Query.ContainsKey("bookmark")) {
 				response.Cookies.Append("bookmark", request.Query["bookmark"], new CookieOptions {Expires = DateTimeOffset.MaxValue});
-				//disabled for HSTS compliance
-				response.Redirect(redirectUri + "bookmark=" + request.Query["bookmark"]);
+				response.Redirect(redirectUri);
 			}
 			//if no cookie exists or cookie is invalid
 			else if (!request.Cookies.ContainsKey("bookmark") || !Guid.TryParseExact(request.Cookies["bookmark"], "D", out _)) {
 				var guid = Guid.NewGuid().ToString();
 				response.Cookies.Append("bookmark", guid, new CookieOptions {Expires = DateTimeOffset.MaxValue});
-				response.Redirect(redirectUri + "bookmark=" + guid);
-			}
-			//redir to cookie
-			else if (!request.Query.ContainsKey("bookmark")) {
-				response.Redirect(redirectUri + "bookmark=" + request.Cookies["bookmark"]);
+				response.Redirect(redirectUri);
 			}
 		}