diff --git a/src/main/drivers/pwm_mapping.h b/src/main/drivers/pwm_mapping.h
index 47311768ae..3f08d9b500 100644
--- a/src/main/drivers/pwm_mapping.h
+++ b/src/main/drivers/pwm_mapping.h
@@ -29,7 +29,7 @@
 #define MAX_MOTORS  12
 #endif
 
-#define MAX_SERVOS  34
+#define MAX_SERVOS  18
 
 #define PWM_TIMER_HZ    1000000
 
diff --git a/src/main/flight/servos.h b/src/main/flight/servos.h
index 79ab18caa3..23ac3fda49 100644
--- a/src/main/flight/servos.h
+++ b/src/main/flight/servos.h
@@ -20,7 +20,7 @@
 #include "config/parameter_group.h"
 #include "programming/logic_condition.h"
 
-#define MAX_SUPPORTED_SERVOS 34
+#define MAX_SUPPORTED_SERVOS 18
 
 // These must be consecutive
 typedef enum {
@@ -68,7 +68,6 @@ typedef enum {
     INPUT_HEADTRACKER_ROLL          = 41,
     INPUT_RC_CH17                   = 42,
     INPUT_RC_CH18                   = 43,
-#ifdef USE_24CHANNELS
     INPUT_RC_CH19                   = 44,
     INPUT_RC_CH20                   = 45,
     INPUT_RC_CH21                   = 46,
@@ -85,7 +84,6 @@ typedef enum {
     INPUT_RC_CH32                   = 57,
     INPUT_RC_CH33                   = 58,
     INPUT_RC_CH34                   = 59,
-#endif
     INPUT_SOURCE_COUNT
 } inputSource_e;