diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index a486291249..d5ebe203f6 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -2915,6 +2915,12 @@ Commander::run()
 			_param_flight_uuid.commit_no_notification();
 
 			_last_disarmed_timestamp = hrt_absolute_time();
+
+			// Switch back to Hold mode after autonomous landing
+			if (_vehicle_control_mode.flag_control_auto_enabled) {
+				main_state_transition(_vehicle_status, commander_state_s::MAIN_STATE_AUTO_LOITER,
+						      _vehicle_status_flags, _commander_state);
+			}
 		}
 
 		if (!_arm_state_machine.isArmed()) {