diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 8940b3e708dd12d2dbbfb30f59d22d502255c66f..f3621a37f07953110c06be572bd66f14550d2bd8 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -45,7 +45,7 @@ FlightMap {
     property var    activeVehicleCoordinate:        multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.coordinate : QtPositioning.coordinate()
 
     onActiveVehicleCoordinateChanged: {
-        if (_followVehicle && activeVehicleCoordinate.isValid) {
+        if (_followVehicle && _activeVehicleCoordinateValid && activeVehicleCoordinate.isValid) {
             _initialMapPositionSet = true
             flightMap.center  = activeVehicleCoordinate
         }
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 41cd0fbad0707c622d2fa19461f4454b02da492f..2cef859b1e3fd5838f038c5d57e00b47bccf1f4b 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -85,7 +85,7 @@ QGCView {
     }
 
     function updateMapToVehiclePosition() {
-        if (_activeVehicle && _activeVehicle.coordinateValid && _firstVehiclePosition) {
+        if (_activeVehicle && _activeVehicle.coordinateValid && _activeVehicle.coordinate.isValid && _firstVehiclePosition) {
             _firstVehiclePosition = false
             editorMap.center = _activeVehicle.coordinate
         }