diff --git a/src/modules/flight_mode_manager/FlightModeManager.cpp b/src/modules/flight_mode_manager/FlightModeManager.cpp
index 70bb9671a1..366ba68f94 100644
--- a/src/modules/flight_mode_manager/FlightModeManager.cpp
+++ b/src/modules/flight_mode_manager/FlightModeManager.cpp
@@ -428,7 +428,7 @@ void FlightModeManager::handleCommand()
 
 					// if we just switched and parameters are not accepted, go to failsafe
 					if (switch_result >= FlightTaskError::NoError) {
-						switchTask(FlightTaskIndex::ManualPosition);
+						switchTask(FlightTaskIndex::Failsafe);
 						cmd_result = vehicle_command_ack_s::VEHICLE_RESULT_FAILED;
 					}
 				}