diff --git a/openpilot/selfdrive/selfdrived/selfdrived.py b/openpilot/selfdrive/selfdrived/selfdrived.py
index 69e2fd14a2..3816ab6979 100755
--- a/openpilot/selfdrive/selfdrived/selfdrived.py
+++ b/openpilot/selfdrive/selfdrived/selfdrived.py
@@ -575,7 +575,8 @@ class SelfdriveD(CruiseHelper):
     clear_event_types = set()
     if ET.WARNING not in self.state_machine.current_alert_types:
       clear_event_types.add(ET.WARNING)
-    if self.enabled or ET.USER_DISABLE in self.state_machine.current_alert_types:
+    cat = self.state_machine.current_alert_types
+    if self.enabled or ((ET.ENABLE in cat or ET.USER_DISABLE in cat) and ET.NO_ENTRY not in cat):
       clear_event_types.add(ET.NO_ENTRY)
 
     pers = LONGITUDINAL_PERSONALITY_MAP[self.personality]