diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index b17bb03b7..9e703c2fc 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -507,7 +507,7 @@ const clivalue_t valueTable[] = {
     { "input_filtering_mode",       VAR_INT8   | MASTER_VALUE | MODE_LOOKUP,  &pwmConfig()->inputFilteringMode, .config.lookup = { TABLE_OFF_ON } },
 #endif
     { "fpv_mix_degrees",            VAR_UINT8  | MASTER_VALUE,  &rxConfig()->fpvCamAngleDegrees, .config.minmax = { 0,  50 } },
-    { "max_aux_channels",           VAR_UINT8  | MASTER_VALUE,  &rxConfig()->max_aux_channel, .config.minmax = { 0,  13 } },
+    { "max_aux_channels",           VAR_UINT8  | MASTER_VALUE,  &rxConfig()->max_aux_channel, .config.minmax = { 0,  20 } },
     { "debug_mode",                 VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP,  &masterConfig.debug_mode, .config.lookup = { TABLE_DEBUG } },
 
     { "min_throttle",               VAR_UINT16 | MASTER_VALUE,  &motorConfig()->minthrottle, .config.minmax = { PWM_RANGE_ZERO,  PWM_RANGE_MAX } },
diff --git a/src/main/target/common.h b/src/main/target/common.h
index a9270aa8a..38e562c18 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -74,7 +74,7 @@
 #define USE_PPM
 
 #if defined(STM_FAST_TARGET)
-#define MAX_AUX_CHANNELS                99
+#define MAX_AUX_CHANNELS                20
 #define TASK_GYROPID_DESIRED_PERIOD     125
 #define SCHEDULER_DELAY_LIMIT           10
 #else