diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc
index db3ad990abe4aa4318b89a4eca11b1b112a89386..bb418830646a988c984a7707b1dd9f13dffab0d9 100644
--- a/src/MissionManager/FixedWingLandingComplexItem.cc
+++ b/src/MissionManager/FixedWingLandingComplexItem.cc
@@ -100,6 +100,12 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(Vehicle* vehicle, bool
     connect(this,                       &FixedWingLandingComplexItem::altitudesAreRelativeChanged,      this, &FixedWingLandingComplexItem::coordinateHasRelativeAltitudeChanged);
     connect(this,                       &FixedWingLandingComplexItem::altitudesAreRelativeChanged,      this, &FixedWingLandingComplexItem::exitCoordinateHasRelativeAltitudeChanged);
 
+    if (vehicle->apmFirmware()) {
+        // ArduPilot does not support camera commands
+        _stopTakingVideoFact.setRawValue(false);
+        _stopTakingPhotosFact.setRawValue(false);
+    }
+
     if (_valueSetIsDistanceFact.rawValue().toBool()) {
         _recalcFromHeadingAndDistanceChange();
     } else {
diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/PlanView/FWLandingPatternEditor.qml
index 2bfbd1e70830991878e371d14e02e15478a9ca8d..fd3ed3f8990420c303ac19f942e3668e091b1d34 100644
--- a/src/PlanView/FWLandingPatternEditor.qml
+++ b/src/PlanView/FWLandingPatternEditor.qml
@@ -32,11 +32,15 @@ Rectangle {
     //property real   availableWidth    ///< Width for control
     //property var    missionItem       ///< Mission Item for editor
 
+    property var    _masterControler:               masterController
+    property var    _missionController:             _masterControler.missionController
+    property var    _missionVehicle:                _masterControler.controllerVehicle
     property real   _margin:                    ScreenTools.defaultFontPixelWidth / 2
     property real   _spacer:                    ScreenTools.defaultFontPixelWidth / 2
     property var    _activeVehicle:             QGroundControl.multiVehicleManager.activeVehicle
     property string _setToVehicleHeadingStr:    qsTr("Set to vehicle heading")
     property string _setToVehicleLocationStr:   qsTr("Set to vehicle location")
+    property bool   _showCameraSection:         !_missionVehicle.apmFirmware
 
 
     ExclusiveGroup { id: distanceGlideGroup }
@@ -166,15 +170,16 @@ Rectangle {
         }
 
         SectionHeader {
-            id:     cameraSection
-            text:   qsTr("Camera")
+            id:         cameraSection
+            text:       qsTr("Camera")
+            visible:    _showCameraSection
         }
 
         Column {
             anchors.left:       parent.left
             anchors.right:      parent.right
             spacing:            _margin
-            visible:            cameraSection.checked
+            visible:            _showCameraSection && cameraSection.checked
 
             Item { width: 1; height: _spacer }