diff --git a/dash-apps/web-ambient/index.html b/dash-apps/web-ambient/index.html
index 1539b0f6..7ff610be 100644
--- a/dash-apps/web-ambient/index.html
+++ b/dash-apps/web-ambient/index.html
@@ -542,9 +542,8 @@
     const ambientLayer = document.getElementById("ambientLayer");
 
     function mapAssist(car) {
-      if (car.dataSourceType !== "comma") return "off";
       if (car.adasOn) return "full";
-      if (car.madsActive) return "mads";
+      if (car.madsActive && car.dataSourceType === "comma") return "mads";
       return "off";
     }
 
diff --git a/dash-apps/web-analog/scripts/dashboard-model.js b/dash-apps/web-analog/scripts/dashboard-model.js
index 9019b432..fd8f521f 100644
--- a/dash-apps/web-analog/scripts/dashboard-model.js
+++ b/dash-apps/web-analog/scripts/dashboard-model.js
@@ -37,11 +37,12 @@
   }
 
   function normalizeModeState(raw) {
-    if (raw?.dataSourceType !== "comma") return "off";
+    const sunnypilot = raw?.dataSourceType === "comma";
     const direct = String(raw?.state || raw?.mode || "").toLowerCase();
-    if (direct === "off" || direct === "mads" || direct === "full") return direct;
+    if (direct === "off" || direct === "full") return direct;
+    if (direct === "mads") return sunnypilot ? "mads" : "off";
     if (raw?.fullAdas || raw?.adasEnabled || raw?.adasOn) return "full";
-    if (raw?.madsEnabled || raw?.madsActive) return "mads";
+    if (raw?.madsEnabled || raw?.madsActive) return sunnypilot ? "mads" : "off";
     return "off";
   }
 
diff --git a/dash-apps/web-retro/index.html b/dash-apps/web-retro/index.html
index ac38623d..c4b7f208 100644
--- a/dash-apps/web-retro/index.html
+++ b/dash-apps/web-retro/index.html
@@ -446,7 +446,7 @@
   gap: calc(12 * var(--u));
 }
 
-.mode-strip-inner.hidden {
+.mode-text.hidden {
   visibility: hidden;
 }
 
@@ -639,7 +639,6 @@
   iconLim: document.getElementById('icon-lim'),
   modeMads: document.getElementById('mode-mads'),
   modeFull: document.getElementById('mode-full'),
-  modeStripInner: document.querySelector('.mode-strip-inner'),
   stage: document.getElementById('stage'),
   bs: {},
 };
@@ -757,7 +756,7 @@
   const gear    = GEAR_MAP[Math.round(Number(car.gear) || 0)] || GEAR_FALLBACK;
   const isDrive = gear === 'D';
   const showSunnypilotModes = car.dataSourceType === 'comma';
-  const adasOn  = showSunnypilotModes && !!car.adasOn;
+  const adasOn  = !!car.adasOn;
   const mads    = showSunnypilotModes && !!car.madsActive;
   const imp     = !!car.isImperial;
 
@@ -782,7 +781,7 @@
 
   // Mode strip + set speed — show state below, keep right display numeric only
   setModeState(adasOn ? 'full' : (mads ? 'mads' : ''));
-  UI.modeStripInner.classList.toggle('hidden', !showSunnypilotModes);
+  UI.modeMads.classList.toggle('hidden', !showSunnypilotModes);
   fillDisp14(UI.setDisp, adasOn && setSpd > 0 ? formatDisplayValue(setSpd) : BLANK_DISPLAY, 'md');
 
   // Speed limit