diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml
index cb81bdfec184ff04a64ea0f56fb5b73a5151a555..3cccb5705bd64799a42f515165fbb14b7c7f5541 100644
--- a/src/FlightMap/FlightMap.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -32,7 +32,7 @@ Map {
     id: _map
 
     property string mapName:            'defaultMap'
-    property bool   isSatelliteMap:     QGroundControl.flightMapSettings.mapType == "Satellite" || QGroundControl.flightMapSettings.mapType == "Hybrid"
+    property bool   isSatelliteMap:     activeMapType.name.indexOf("Satellite") > -1 || activeMapType.name.indexOf("Hybrid") > -1
 
     readonly property real  maxZoomLevel: 20
     property variant        scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml
index fff88575c94f2f39e127a379aa3cad87872419c5..b64efd27f21c70dd4f6ec1b67192c1859ca1fcc8 100644
--- a/src/FlightMap/MapScale.qml
+++ b/src/FlightMap/MapScale.qml
@@ -24,8 +24,7 @@ Item {
 
     property variant _scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
 
-    property bool   _isSatelliteMap:    mapControl.activeMapType.name.indexOf("Satellite") > -1 || mapControl.activeMapType.name.indexOf("Hybrid") > -1
-    property var    _color:             _isSatelliteMap ? "white" : "black"
+    property var _color: mapControl.isSatelliteMap ? "white" : "black"
 
     function formatDistance(meters)
     {