diff --git a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
index 29df939..30d061b 100644
--- a/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
@@ -26,6 +26,8 @@ SetupPage {
     pageComponent:      subFramePageComponent
 
     property bool _oldFW:   globals.activeVehicle.versionCompare(3 ,5 ,2) < 0
+    property bool _hasSensibledefaults:   globals.activeVehicle.versionCompare(4 ,1 ,0) >= 0
+
     property var frameModelSelected: undefined
 
     APMAirframeComponentController { id: controller; }
@@ -176,6 +178,12 @@ SetupPage {
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: {
                                     frameModelSelected = subFrameModel.get(index)
+                                    if (_hasSensibledefaults) {
+                                        // No need to suggest loading the default parameters.
+                                        // The firmware default should be good enough.
+                                        setFrameConfig(frameModelSelected.paramValue)
+                                        return
+                                    }
                                     confirmFrameComponent.createObject(mainWindow).open()
                                 }
                             }