diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index 4def139c8d..4a2d90a181 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -1766,6 +1766,7 @@ void Commander::run()
 			_last_disarmed_timestamp = hrt_absolute_time();
 
 			_user_mode_intention.onDisarm();
+			_vehicle_status.takeoff_time = 0;
 		}
 
 		if (!_arm_state_machine.isArmed()) {
@@ -1971,7 +1972,6 @@ void Commander::landDetectorUpdate()
 			if (!was_landed && _vehicle_land_detected.landed) {
 				mavlink_log_info(&_mavlink_log_pub, "Landing detected\t");
 				events::send(events::ID("commander_landing_detected"), events::Log::Info, "Landing detected");
-				_vehicle_status.takeoff_time = 0;
 
 			} else if (was_landed && !_vehicle_land_detected.landed) {
 				mavlink_log_info(&_mavlink_log_pub, "Takeoff detected\t");