diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 768b7a21ad2c1724cdcc3832de4389c1ac3dcee8..3a0b8aed32364335d86c9dbede9a8de856b31174 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -486,7 +486,7 @@ Item {
             anchors.top:            parent.top
             spacing:                ScreenTools.defaultFontPixelWidth
             z:                      _mapAndVideo.z + 4
-            visible:                QGroundControl.multiVehicleManager.vehicles.count > 1
+            visible:                QGroundControl.multiVehicleManager.vehicles.count > 1 && QGroundControl.corePlugin.options.enableMultiVehicleList
 
             ExclusiveGroup { id: multiVehicleSelectorGroup }
 
@@ -535,7 +535,7 @@ Item {
             anchors.right:              parent.right
             anchors.bottom:             parent.bottom
             width:                      ScreenTools.defaultFontPixelWidth * 30
-            visible:                    !singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
+            visible:                    !singleVehicleView.checked && !QGroundControl.videoManager.fullScreen && QGroundControl.corePlugin.options.enableMultiVehicleList
             z:                          _mapAndVideo.z + 4
             guidedActionsController:    _guidedController
         }
diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h
index ee73c27ddc6d39e578f50c354a40231ceb2f96e1..d00fa7c7ee5f82d78d98f7e8ac3dae95cbf13544 100644
--- a/src/api/QGCOptions.h
+++ b/src/api/QGCOptions.h
@@ -62,6 +62,7 @@ public:
     Q_PROPERTY(float                    devicePixelDensity              READ devicePixelDensity             NOTIFY devicePixelDensityChanged)
     Q_PROPERTY(bool                     checkFirmwareVersion            READ checkFirmwareVersion           CONSTANT)
     Q_PROPERTY(bool                     showMavlinkLogOptions           READ showMavlinkLogOptions          CONSTANT)
+    Q_PROPERTY(bool                     enableMultiVehicleList          READ enableMultiVehicleList         CONSTANT)
 
     /// 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.
@@ -113,6 +114,7 @@ public:
     virtual bool    disableVehicleConnection        () const { return false; }  ///< true: vehicle connection is disabled
     virtual bool    checkFirmwareVersion            () const { return true; }
     virtual bool    showMavlinkLogOptions           () const { return true; }
+    virtual bool    enableMultiVehicleList           () const { return true; }
 
 #if defined(__mobile__)
     virtual bool    useMobileFileDialog             () const { return true;}