Initial map position incorrect

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
         }

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
         }