diff --git a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
index a2733d54f7..039a96e96c 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
@@ -126,6 +126,7 @@ bool FlightTaskAuto::_evaluateTriplets()
 		} else {
 			target(0) = _lock_position_xy(0);
 			target(1) = _lock_position_xy(1);
+			_lock_position_xy *= NAN;
 		}
 
 	} else {
diff --git a/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp b/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
index 55ea8ddcf5..8e8d259654 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
@@ -85,7 +85,7 @@ protected:
 	uORB::Subscription<home_position_s> *_sub_home_position{nullptr};
 
 private:
-	matrix::Vector2f _lock_position_xy{};
+	matrix::Vector2f _lock_position_xy{NAN, NAN};
 
 	uORB::Subscription<position_setpoint_triplet_s> *_sub_triplet_setpoint{nullptr};