diff --git a/src/QmlControls/RCChannelMonitorController.cc b/src/QmlControls/RCChannelMonitorController.cc
index 2ab945af36c5a9078f702275aee5053853b69913..fddd8fdcd374a4514103308bdb4a21c639e3c9ad 100644
--- a/src/QmlControls/RCChannelMonitorController.cc
+++ b/src/QmlControls/RCChannelMonitorController.cc
@@ -18,9 +18,7 @@ RCChannelMonitorController::RCChannelMonitorController(void)
 
 void RCChannelMonitorController::_rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels])
 {
-    int maxChannel = std::min(channelCount, _chanMax());
-
-    for (int channel=0; channel<maxChannel; channel++) {
+    for (int channel=0; channel<channelCount; channel++) {
         int channelValue = pwmValues[channel];
 
         if (_chanCount != channelCount) {
@@ -33,8 +31,3 @@ void RCChannelMonitorController::_rcChannelsChanged(int channelCount, int pwmVal
         }
     }
 }
-
-int RCChannelMonitorController::_chanMax(void) const
-{
-    return _vehicle->firmwareType() == MAV_AUTOPILOT_PX4 ? _chanMaxPX4 : _chanMaxAPM;
-}
diff --git a/src/QmlControls/RCChannelMonitorController.h b/src/QmlControls/RCChannelMonitorController.h
index 1bd5971b5861e325a3b4fee57e5711c9e992be6c..68d158fd7d4706499fa1774e37c5a7b0d4519259 100644
--- a/src/QmlControls/RCChannelMonitorController.h
+++ b/src/QmlControls/RCChannelMonitorController.h
@@ -37,12 +37,7 @@ private slots:
     void _rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels]);
 
 private:
-    int _chanMax(void) const;
-
     int _chanCount;
-
-    static const int _chanMaxPX4 = 18;  ///< Maximum number of supported rc channels, PX4 Firmware
-    static const int _chanMaxAPM = 14;  ///< Maximum number of supported rc channels, APM firmware
 };
 
 #endif // RCChannelMonitorController_H