diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml
index 08bedd522f9fa3dbc252e640b94484f12e1f4f42..c926e01813dd4c06d6c0dc9d60e7851523797107 100644
--- a/src/FlightMap/FlightMap.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -78,7 +78,10 @@ Map {
     onGcsPositionChanged: {
         if (gcsPosition.isValid && allowGCSLocationCenter && !firstGCSPositionReceived && !firstVehiclePositionReceived) {
             firstGCSPositionReceived = true
-            center = gcsPosition
+            //-- Only center on gsc if we have no vehicle (and we are supposed to do so)
+            var activeVehicleCoordinate = activeVehicle ? activeVehicle.coordinate : QtPositioning.coordinate()
+            if(QGroundControl.settingsManager.flyViewSettings.keepMapCenteredOnVehicle.rawValue || !activeVehicleCoordinate.isValid)
+                center = gcsPosition
         }
     }