diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 8b3086cb70cfca8b0e42a8fffd828ce1ebd856f8..e6ef0a3fb9e31cf9a9b28a8cd9431e2053c8d80d 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -36,6 +36,7 @@ Rectangle {
 
     property string _messagePanelText:              "missing message panel text"
     property bool   _fullParameterVehicleAvailable: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable && !QGroundControl.multiVehicleManager.activeVehicle.parameterManager.missingParameters
+    property var    _corePlugin:                    QGroundControl.corePlugin
 
     function showSummaryPanel()
     {
@@ -231,14 +232,14 @@ Rectangle {
             }
 
             Repeater {
-                model:              QGroundControl.corePlugin.settingsPages
-                visible:            QGroundControl.corePlugin.options.combineSettingsAndSetup
+                model:              _corePlugin.settingsPages
+                visible:            _corePlugin.options.combineSettingsAndSetup
                 SubMenuButton {
                     imageResource:      modelData.icon
                     setupIndicator:     false
                     exclusiveGroup:     setupButtonGroup
                     text:               modelData.title
-                    visible:            QGroundControl.corePlugin.options.combineSettingsAndSetup
+                    visible:            _corePlugin.options.combineSettingsAndSetup
                     onClicked:          panelLoader.setSource(modelData.url)
                     Layout.fillWidth:   true
                 }
@@ -261,7 +262,7 @@ Rectangle {
                 imageResource:      "/qmlimages/FirmwareUpgradeIcon.png"
                 setupIndicator:     false
                 exclusiveGroup:     setupButtonGroup
-                visible:            !ScreenTools.isMobile
+                visible:            !ScreenTools.isMobile && _corePlugin.options.showFirmwareUpgrade
                 text:               "Firmware"
                 Layout.fillWidth:   true
 
@@ -311,7 +312,7 @@ Rectangle {
             SubMenuButton {
                 setupIndicator:     false
                 exclusiveGroup:     setupButtonGroup
-                visible:            QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable && QGroundControl.corePlugin.showAdvancedUI
+                visible:            QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable && _corePlugin.showAdvancedUI
                 text:               "Parameters"
                 Layout.fillWidth:   true
 
diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h
index 1a41a0ee59a7c01a5373d18ea0d2728db6194f5f..baf6cb678c8126adacadda4a5ba05ae0b6c20952 100644
--- a/src/api/QGCOptions.h
+++ b/src/api/QGCOptions.h
@@ -34,6 +34,7 @@ public:
     Q_PROPERTY(bool                     showSensorCalibrationLevel      READ showSensorCalibrationLevel     NOTIFY showSensorCalibrationLevelChanged)
     Q_PROPERTY(bool                     showSensorCalibrationAirspeed   READ showSensorCalibrationAirspeed  NOTIFY showSensorCalibrationAirspeedChanged)
     Q_PROPERTY(bool                     showSensorCalibrationOrient     READ showSensorCalibrationOrient    NOTIFY showSensorCalibrationOrientChanged)
+    Q_PROPERTY(bool                     showFirmwareUpgrade             READ showFirmwareUpgrade            NOTIFY showFirmwareUpgradeChanged)
 
     /// Should QGC hide its settings menu and colapse it into one single menu (Settings and Vehicle Setup)?
     /// @return true if QGC should consolidate both menus into one.
@@ -59,6 +60,8 @@ public:
     virtual bool showSensorCalibrationAirspeed  () const { return true; }
     virtual bool showSensorCalibrationOrient    () const { return true; }
 
+    virtual bool showFirmwareUpgrade            () const { return true; }
+
 signals:
     void showSensorCalibrationCompassChanged    (bool show);
     void showSensorCalibrationGyroChanged       (bool show);
@@ -66,6 +69,7 @@ signals:
     void showSensorCalibrationLevelChanged      (bool show);
     void showSensorCalibrationAirspeedChanged   (bool show);
     void showSensorCalibrationOrientChanged     (bool show);
+    void showFirmwareUpgradeChanged             (bool show);
 
 private:
     CustomInstrumentWidget* _defaultInstrumentWidget;