diff --git a/src/ui/px4_configuration/PX4RCCalibration.cc b/src/ui/px4_configuration/PX4RCCalibration.cc
index 5503a1145259b18bfd14bd48faabccb122f83ad5..e4df03db45c8b2c0d15c256e20d00c05e47f28a4 100644
--- a/src/ui/px4_configuration/PX4RCCalibration.cc
+++ b/src/ui/px4_configuration/PX4RCCalibration.cc
@@ -924,6 +924,11 @@ void PX4RCCalibration::_writeCalibration(void)
         paramMgr->setPendingParam(0, _rgFunctionInfo[i].parameterName, paramChannel);
     }
     
+    // If the RC_CHAN_COUNT parameter is available write the channel count
+    if (paramMgr->getComponentForParam("RC_CHAN_CNT").count() != 0) {
+        paramMgr->setPendingParam(0, "RC_CHAN_CNT", _chanCount);
+    }
+
     //let the param mgr manage sending all the pending RC_foo updates and persisting after
     paramMgr->sendPendingParameters(true, true);