diff --git a/src/AutoPilotPlugins/Common/RadioComponent.qml b/src/AutoPilotPlugins/Common/RadioComponent.qml
index 75e038a5eea02b0de993f3aebcd285d7afff5a3e..2d4bd7fc6ddc7c344b1234052ab862dbe69fa849 100644
--- a/src/AutoPilotPlugins/Common/RadioComponent.qml
+++ b/src/AutoPilotPlugins/Common/RadioComponent.qml
@@ -423,7 +423,11 @@ SetupPage {
                 }
 
                 Repeater {
-                    model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ? [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] : 0
+                    model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
+                               (QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
+                                   [ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
+                                   [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
+                               0
 
                     Row {
                         spacing: ScreenTools.defaultFontPixelWidth
diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
index 17eb6fefb7fa7796e940b7fd7599983e8e171cf6..6704f871f572c5db171c1d7a1016904479334b92 100644
--- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
@@ -46,8 +46,9 @@ FactPanel {
         }
 
         VehicleSummaryRow {
-            labelText: qsTr("Flaps:")
-            valueText: mapFlapsFact ? (mapFlapsFact.value === 0 ? qsTr("Disabled") : mapFlapsFact.valueString) : ""
+            labelText:  qsTr("Flaps:")
+            valueText:  mapFlapsFact ? (mapFlapsFact.value === 0 ? qsTr("Disabled") : mapFlapsFact.valueString) : ""
+            visible:    !controller.vehicle.multiRotor
         }
 
         VehicleSummaryRow {