diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp
index 13ecf30acc..8f7789c17a 100644
--- a/src/modules/navigator/mission_block.cpp
+++ b/src/modules/navigator/mission_block.cpp
@@ -711,7 +711,13 @@ MissionBlock::set_land_item(struct mission_item_s *item, bool at_current_locatio
 	if (at_current_location) {
 		item->lat = _navigator->get_global_position()->lat;
 		item->lon = _navigator->get_global_position()->lon;
-		item->yaw = _navigator->get_global_position()->yaw;
+
+		if (_navigator->home_position_valid()) {
+			item->yaw = _navigator->get_global_position()->yaw;
+
+		}	else {
+			item->yaw = _navigator->get_local_position()->yaw;
+		}
 
 		/* use home position */