diff --git a/selfdrive/ui/layouts/settings/toggles.py b/selfdrive/ui/layouts/settings/toggles.py
index dbe5e241aacdea..0a69a3c5ba2855 100644
--- a/selfdrive/ui/layouts/settings/toggles.py
+++ b/selfdrive/ui/layouts/settings/toggles.py
@@ -190,6 +190,10 @@ def _update_toggles(self):
 
         self._toggles["ExperimentalMode"].set_description("<b>" + long_desc + "</b><br><br>" + e2e_description)
     else:
+      self._toggles["ExperimentalMode"].action_item.set_enabled(False)
+      self._toggles["ExperimentalMode"].action_item.set_state(False)
+      self._long_personality_setting.action_item.set_enabled(False)
+      self._params.remove("ExperimentalMode")
       self._toggles["ExperimentalMode"].set_description(e2e_description)
 
     self._update_experimental_mode_icon()
diff --git a/selfdrive/ui/mici/layouts/settings/toggles.py b/selfdrive/ui/mici/layouts/settings/toggles.py
index d6a91b40f72716..3acfc90e3fc5f9 100644
--- a/selfdrive/ui/mici/layouts/settings/toggles.py
+++ b/selfdrive/ui/mici/layouts/settings/toggles.py
@@ -89,6 +89,11 @@ def _update_toggles(self):
         self._experimental_btn.set_checked(False)
         self._personality_toggle.set_visible(False)
         ui_state.params.remove("ExperimentalMode")
+    else:
+      self._experimental_btn.set_visible(False)
+      self._experimental_btn.set_checked(False)
+      self._personality_toggle.set_visible(False)
+      ui_state.params.remove("ExperimentalMode")
 
     # Refresh toggles from params to mirror external changes
     for key, item in self._refresh_toggles: