diff --git a/bridge/aria_bridge.py b/bridge/aria_bridge.py
index a49e673..a46146b 100644
--- a/bridge/aria_bridge.py
+++ b/bridge/aria_bridge.py
@@ -37,7 +37,7 @@ import websockets
 from faster_whisper import WhisperModel
 from openwakeword.model import Model as WakeWordModel
 
-from modes import Mode, detect_mode_switch, mode_from_id, should_speak
+from modes import Mode, canonical_id, detect_mode_switch, mode_from_id, should_speak
 
 # ── Logging ──────────────────────────────────────────────────
 
@@ -921,7 +921,7 @@ class ARIABridge:
             await self._send_to_rvs({
                 "type": "mode",
                 "payload": {
-                    "mode": self.current_mode.name.lower(),
+                    "mode": canonical_id(self.current_mode),
                     "name": self.current_mode.config.name,
                     "emoji": self.current_mode.config.emoji,
                     "sender": "bridge",  # Filter in mode-Handler gegen Loops
diff --git a/bridge/modes.py b/bridge/modes.py
index 5b53860..4ea040d 100644
--- a/bridge/modes.py
+++ b/bridge/modes.py
@@ -110,6 +110,21 @@ def mode_from_id(mode_id: str) -> Optional[Mode]:
     return _ID_MAP.get(mode_id.strip().lower())
 
 
+# Kanonische IDs fuer Broadcasts (matchen die App-UI-IDs in ModeSelector)
+_CANONICAL_ID: dict[Mode, str] = {
+    Mode.NORMAL: "normal",
+    Mode.DND: "nicht_stoeren",
+    Mode.WHISPER: "fluester",
+    Mode.HANGAR: "hangar",
+    Mode.GAMING: "gaming",
+}
+
+
+def canonical_id(mode: Mode) -> str:
+    """Kanonische ID die App + Diagnostic + Bridge gleichermassen kennen."""
+    return _CANONICAL_ID.get(mode, mode.name.lower())
+
+
 def detect_mode_switch(text: str) -> Optional[Mode]:
     """Erkennt ob ein Text eine Modus-Umschaltung enthaelt.
 
diff --git a/diagnostic/index.html b/diagnostic/index.html
index 14e12df..c567151 100644
--- a/diagnostic/index.html
+++ b/diagnostic/index.html
@@ -383,10 +383,10 @@
           <button class="btn mode-btn" data-mode="normal" onclick="setMode('normal')" style="background:#1E1E2E;border:2px solid transparent;">
             <span style="font-size:18px;">&#x1F7E2;</span> Normal<br><span style="font-size:10px;color:#8888AA;">Hoert zu, antwortet, spricht</span>
           </button>
-          <button class="btn mode-btn" data-mode="dnd" onclick="setMode('dnd')" style="background:#1E1E2E;border:2px solid transparent;">
+          <button class="btn mode-btn" data-mode="nicht_stoeren" onclick="setMode('nicht_stoeren')" style="background:#1E1E2E;border:2px solid transparent;">
             <span style="font-size:18px;">&#x1F534;</span> Nicht stoeren<br><span style="font-size:10px;color:#8888AA;">Nur Kritikalarme</span>
           </button>
-          <button class="btn mode-btn" data-mode="whisper" onclick="setMode('whisper')" style="background:#1E1E2E;border:2px solid transparent;">
+          <button class="btn mode-btn" data-mode="fluester" onclick="setMode('fluester')" style="background:#1E1E2E;border:2px solid transparent;">
             <span style="font-size:18px;">&#x1F7E1;</span> Fluestern<br><span style="font-size:10px;color:#8888AA;">Nur Text, keine Sprache</span>
           </button>
           <button class="btn mode-btn" data-mode="hangar" onclick="setMode('hangar')" style="background:#1E1E2E;border:2px solid transparent;">
@@ -753,6 +753,16 @@
           return;
         }
 
+        if (msg.type === 'mode' && msg.payload) {
+          // Bridge hat den Modus geaendert (evtl. von anderer App/Diagnostic) — UI syncen
+          const mode = (msg.payload.mode || '').toLowerCase();
+          if (MODE_LABELS[mode]) {
+            updateModeUI(mode);
+            log("info", "server", `Mode-Sync: ${mode}`);
+          }
+          return;
+        }
+
         if (msg.type === 'xtts_voices_list') {
           const select = document.getElementById('diag-xtts-voice');
           // Aktuelle Auswahl merken damit Rebuild sie nicht zerstoert
@@ -1638,19 +1648,24 @@
     const origSwitchMainTab = typeof switchMainTab === 'function' ? switchMainTab : null;
 
     // ── Modus-Wechsel ────────────────────────────
+    // Kanonische IDs (matchen bridge/modes.py canonical_id + android ModeSelector)
+    const MODE_LABELS = { normal: 'Normal', nicht_stoeren: 'Nicht stoeren', fluester: 'Fluestern', hangar: 'Hangar', gaming: 'Gaming' };
     let currentMode = 'normal';
-    const MODE_LABELS = { normal: 'Normal', dnd: 'Nicht stoeren', whisper: 'Fluestern', hangar: 'Hangar', gaming: 'Gaming' };
 
-    function setMode(mode) {
+    function updateModeUI(mode) {
       currentMode = mode;
-      // Visuelles Feedback
       document.querySelectorAll('.mode-btn').forEach(btn => {
         btn.style.borderColor = btn.dataset.mode === mode ? '#0096FF' : 'transparent';
       });
-      document.getElementById('mode-status').textContent = `Aktueller Modus: ${MODE_LABELS[mode] || mode}`;
-      // An Bridge senden via RVS
-      sendToRVS(`ARIA, ${MODE_LABELS[mode]}-Modus`, false);
-      log("info", "server", `Modus gewechselt: ${mode}`);
+      const label = MODE_LABELS[mode] || mode;
+      document.getElementById('mode-status').textContent = `Aktueller Modus: ${label}`;
+    }
+
+    function setMode(mode) {
+      // Optimistic UI-Update — Bridge bestaetigt per Broadcast
+      updateModeUI(mode);
+      // Sauberer Weg: type=mode via RVS an Bridge — die broadcastet an alle Clients
+      send({ action: 'set_mode', mode });
     }
 
     // ── TTS Diagnose ─────────────────────────────
diff --git a/diagnostic/server.js b/diagnostic/server.js
index 49b0465..3738144 100644
--- a/diagnostic/server.js
+++ b/diagnostic/server.js
@@ -622,6 +622,10 @@ function connectRVS(forcePlain) {
         }});
       } else if (msg.type === "heartbeat") {
         // ignorieren
+      } else if (msg.type === "mode") {
+        // Mode-Broadcast von der Bridge → an Browser-Clients weiterreichen
+        log("info", "rvs", `Mode-Broadcast: ${msg.payload?.mode} (${msg.payload?.name})`);
+        broadcast({ type: "mode", payload: msg.payload });
       } else {
         log("debug", "rvs", `Nachricht: ${JSON.stringify(msg).slice(0, 150)}`);
       }
@@ -1343,6 +1347,10 @@ wss.on("connection", (ws) => {
         // Weiterleiten an XTTS-Bridge, die antwortet mit neuer Liste
         sendToRVS_raw({ type: "xtts_delete_voice", payload: { name: msg.name }, timestamp: Date.now() });
         log("info", "server", `Voice-Delete '${msg.name}' an XTTS-Bridge gesendet`);
+      } else if (msg.action === "set_mode") {
+        // Mode-Wechsel → Bridge bearbeitet und broadcastet an alle Clients
+        sendToRVS_raw({ type: "mode", payload: { mode: msg.mode }, timestamp: Date.now() });
+        log("info", "server", `Mode-Wechsel angefordert: ${msg.mode}`);
       } else if (msg.action === "get_voice_config") {
         handleGetVoiceConfig(ws);
       } else if (msg.action === "send_voice_config") {