diff --git a/selfdrive/selfdrived/selfdrived.py b/selfdrive/selfdrived/selfdrived.py
index cd70fdf1b5..52baa4de08 100755
--- a/selfdrive/selfdrived/selfdrived.py
+++ b/selfdrive/selfdrived/selfdrived.py
@@ -368,9 +368,6 @@ class SelfdriveD:
         self.params.put_nonblocking('LongitudinalPersonality', str(self.personality))
         self.events.add(EventName.personalityChanged)
 
-    if self.mads.enabled_toggle:
-      self.mads.update_events(CS)
-
   def data_sample(self):
     car_state = messaging.recv_one(self.car_state_sock)
     CS = car_state.carState if car_state else self.CS_prev
diff --git a/sunnypilot/mads/mads.py b/sunnypilot/mads/mads.py
index 247c0599ce..351aff027e 100644
--- a/sunnypilot/mads/mads.py
+++ b/sunnypilot/mads/mads.py
@@ -19,14 +19,14 @@ class ModifiedAssistDrivingSystem:
     self.main_enabled_toggle = True  # TODO-SP: Apply with toggle
     self.disengage_lateral_on_brake_toggle = False  # TODO-SP: Apply with toggle
 
-  def update_availability(self, CS: car.CarState, available: bool = False) -> None:
+  def update_availability(self, CS: car.CarState, available: bool = False) -> bool:
     if self.main_enabled_toggle:
       available |= CS.cruiseState.available
 
     if self.selfdrive.CP.carName == "hyundai":
       available = True
 
-    self.available = available
+    return available
 
   def update_events(self, CS: car.CarState):
     self.selfdrive.events.remove(EventName.pcmEnable)
@@ -74,7 +74,9 @@ class ModifiedAssistDrivingSystem:
     if not self.enabled_toggle:
       return
 
-    self.update_availability(CS)
+    self.available = self.update_availability(CS)
+
+    self.update_events(CS)
 
     if not self.selfdrive.CP.passive and self.selfdrive.initialized:
       self.enabled, self.active = self.state_machine.update(self.selfdrive.events)