diff --git a/src/modules/src/supervisor.c b/src/modules/src/supervisor.c
index d9e6ae3e73..b7fce677bd 100644
--- a/src/modules/src/supervisor.c
+++ b/src/modules/src/supervisor.c
@@ -263,9 +263,9 @@ static void postTransitionActions(SupervisorMem_t* this, const supervisorState_t
   if (newState == supervisorStateLanded) {
     supervisorSetLatestLandingTime(this, currentTick);
   }
-  
+
   if ((previousState == supervisorStateLanded) && (newState == supervisorStateReset)) {
-    DEBUG_PRINT("Landing timeout, disarming\n");
+    DEBUG_PRINT("Disarming\n");
   }
 
   if (newState == supervisorStateLocked) {
diff --git a/src/modules/src/supervisor_state_machine.c b/src/modules/src/supervisor_state_machine.c
index 636b6e378b..ae3ae72eb8 100644
--- a/src/modules/src/supervisor_state_machine.c
+++ b/src/modules/src/supervisor_state_machine.c
@@ -199,8 +199,8 @@ static SupervisorStateTransition_t transitionsLanded[] = {
     .newState = supervisorStateReset,
 
     .triggers = SUPERVISOR_CB_LANDING_TIMEOUT,
-    .negatedTriggers = SUPERVISOR_CB_NONE,
-    .triggerCombiner = supervisorAll,
+    .negatedTriggers = SUPERVISOR_CB_ARMED,
+    .triggerCombiner = supervisorAny,
 
     .blockerCombiner = supervisorNever,
   },