diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
index 14c7cb12323e72e3f6474fa73838a1554ba729b4..662b6c91a8a95aa3ddfef03207044fed185c8b17 100644
--- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml
+++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
@@ -276,33 +276,31 @@ QGCView {
                         text:           qsTr("Memory cache changes require a restart to take effect.")
                     }
 
-                    Item { width: 1; height: 1 }
-
-                    QGCLabel { text: qsTr("MapBox Access Token") }
-
+                    Item { width: 1; height: 1; visible: _mapboxFact ? _mapboxFact.visible : false }
+                    QGCLabel { text: qsTr("MapBox Access Token"); visible: _mapboxFact ? _mapboxFact.visible : false }
                     FactTextField {
                         fact:               _mapboxFact
+                        visible:            _mapboxFact ? _mapboxFact.visible : false
                         maximumLength:      256
                         width:              ScreenTools.defaultFontPixelWidth * 30
                     }
-
                     QGCLabel {
                         text:           qsTr("With an access token, you can use MapBox Maps.")
+                        visible:        _mapboxFact ? _mapboxFact.visible : false
                         font.pointSize: _adjustableFontPointSize
                     }
 
-                    Item { width: 1; height: 1 }
-
-                    QGCLabel { text: qsTr("Esri Access Token") }
-
+                    Item { width: 1; height: 1; visible: _esriFact ? _esriFact.visible : false }
+                    QGCLabel { text: qsTr("Esri Access Token"); visible: _esriFact ? _esriFact.visible : false }
                     FactTextField {
                         fact:               _esriFact
+                        visible:            _esriFact ? _esriFact.visible : false
                         maximumLength:      256
                         width:              ScreenTools.defaultFontPixelWidth * 30
                     }
-
                     QGCLabel {
                         text:           qsTr("With an access token, you can use Esri Maps.")
+                        visible:        _esriFact ? _esriFact.visible : false
                         font.pointSize: _adjustableFontPointSize
                     }
                 } // GridLayout
diff --git a/src/Settings/FlightMapSettings.cc b/src/Settings/FlightMapSettings.cc
index f4075a19371f71d6c9508ea629d3173fc0822054..ece0be39e949997b1272e5a3c247a2bcb8804215 100644
--- a/src/Settings/FlightMapSettings.cc
+++ b/src/Settings/FlightMapSettings.cc
@@ -110,6 +110,9 @@ void FlightMapSettings::_newMapProvider(QVariant value)
         _removeEnumValue(mapTypeSatellite, enumStrings, enumValues);
         _removeEnumValue(mapTypeHybrid, enumStrings, enumValues);
         break;
+    case mapProviderEsri:
+        _removeEnumValue(mapTypeHybrid, enumStrings, enumValues);
+        break;
     }
     metaData->setEnumInfo(enumStrings, enumValues);
     emit mapTypeChanged();