diff --git a/_content/keyboards/session.php b/_content/keyboards/session.php
index 666f223a..54e1b683 100644
--- a/_content/keyboards/session.php
+++ b/_content/keyboards/session.php
@@ -54,6 +54,7 @@
     ]);
     $session_query_q = "?$session_query";
   } else {
+    setcookie('embed_keyboards_no_locale_redirect', '', ["secure" => true, "samesite" => 'None', 'path' => '/']);
     $session_query = '';
     $session_query_q = '';
   }
diff --git a/go/site/redirect_locale.php b/go/site/redirect_locale.php
index 8cfdc8e1..bd3639fc 100644
--- a/go/site/redirect_locale.php
+++ b/go/site/redirect_locale.php
@@ -37,6 +37,10 @@
     $lang = Locale::DEFAULT_LOCALE;
   }
 
+  if(empty($lang)) {
+    $lang = Locale::DEFAULT_LOCALE;
+  }
+
   // The url that was originally requested is passed in through the server
   // variable REQUEST_URI by mod_rewrite, including the initial slash (/).
   $url = $_SERVER['REQUEST_URI'];