diff --git a/src/client/FlagInput.ts b/src/client/FlagInput.ts
index db59a4eba..c156dbc53 100644
--- a/src/client/FlagInput.ts
+++ b/src/client/FlagInput.ts
@@ -21,12 +21,13 @@ export class FlagInput extends LitElement {
   }
 
   private updateFlag = (e: CustomEvent) => {
-    const parsed = FlagName.safeParse(e.detail);
+    const val = e.detail ?? "";
+    const parsed = FlagName.safeParse(val);
     if (!parsed.success) {
-      console.warn(`error parsing flag ${e.detail.value}, ${parsed.error}`);
+      console.warn(`error parsing flag ${val}, ${parsed.error}`);
     }
-    if (this.flag !== e.detail) {
-      this.flag = e.detail;
+    if (this.flag !== val) {
+      this.flag = val;
     }
   };
 
diff --git a/src/core/game/UserSettings.ts b/src/core/game/UserSettings.ts
index 4728a9875..e077f4079 100644
--- a/src/core/game/UserSettings.ts
+++ b/src/core/game/UserSettings.ts
@@ -243,14 +243,14 @@ export class UserSettings {
 
   setFlag(flag: string): void {
     if (flag === "country:xx") {
-      this.clearFlag();
+      this.clearFlag(true);
     } else {
       this.setCached(FLAG_KEY, flag);
     }
   }
 
-  clearFlag(): void {
-    this.removeCached(FLAG_KEY);
+  clearFlag(emitChange: boolean = false): void {
+    this.removeCached(FLAG_KEY, emitChange);
   }
 
   backgroundMusicVolume(): number {