diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc
index 59c84b856bcb0dab1bc21eb56cba8bb2b5adeb5a..50d7cc750937fb00da13bd35f1eba991027b1f3a 100644
--- a/src/AutoPilotPlugins/Common/RadioComponentController.cc
+++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc
@@ -646,7 +646,7 @@ void RadioComponentController::_setInternalCalibrationValuesFromParameters(void)
             if (paramFact) {
                 paramChannel = paramFact->rawValue().toInt();
 
-                if (paramChannel != 0) {
+                if (paramChannel > 0 && paramChannel <= _chanMax()) {
                     _rgFunctionChannelMapping[i] = paramChannel - 1;
                     _rgChannelInfo[paramChannel - 1].function = (enum rcCalFunctions)i;
                 }