diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py
index 5f7112ad8d..66b3b4b5a2 100644
--- a/sunnypilot/mads/mads.py
+++ b/sunnypilot/mads/mads.py
@@ -66,7 +66,7 @@ class ModularAssistiveDrivingSystem:
 
   def update_events(self, CS: car.CarState):
     def update_unified_engagement_mode():
-      if (self.unified_engagement_mode and self.enabled) or not self.unified_engagement_mode:
+      if (self.unified_engagement_mode and (self.enabled or self.selfdrive.enabled)) or not self.unified_engagement_mode:
         self.events.remove(EventName.pcmEnable)
         self.events.remove(EventName.buttonEnable)