diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
index bcdef05afc84f15c26260d9f42dc984fbb1855f4..1b91c6af1935439149ae00b5670e5dbc9295c008 100644
--- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
+++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
@@ -23,6 +23,7 @@ Rectangle {
     height:         _itemIndicatorHeight + (_touchMarginVertical * 2)
     color:          "transparent"
     z:              QGroundControl.zOrderMapItems + 1    // Above item icons
+    visible:        itemCoordinate.isValid
 
     // Properties which must be specific by consumer
     property var mapControl     ///< Map control which contains this item
diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml
index 4f9fe11d68a6b4813530050cbbc38066eae12b73..0d98659036c4b40a84f93a77d1cb615593123ed4 100644
--- a/src/FlightMap/MapItems/MissionLineView.qml
+++ b/src/FlightMap/MapItems/MissionLineView.qml
@@ -24,6 +24,6 @@ MapItemView {
         line.color: "#be781c"                           // Hack, can't get palette to work in here
         z:          QGroundControl.zOrderWaypointLines
 
-        path: object ? [ object.coordinate1, object.coordinate2 ] : [ ]
+        path: object && object.coordinate1.isValid && object.coordinate2.isValid ? [ object.coordinate1, object.coordinate2 ] : []
     }
 }