diff --git a/src/main/drivers/pwm_mapping.h b/src/main/drivers/pwm_mapping.h
index cfb96afadb..08123130f2 100644
--- a/src/main/drivers/pwm_mapping.h
+++ b/src/main/drivers/pwm_mapping.h
@@ -24,13 +24,12 @@
 
 #if defined(TARGET_MOTOR_COUNT)
 #define MAX_MOTORS  TARGET_MOTOR_COUNT
-#define MAX_SERVOS  16
-
 #else
 #define MAX_MOTORS  12
-#define MAX_SERVOS  16
 #endif
 
+#define MAX_SERVOS  18
+
 #define PWM_TIMER_HZ    1000000
 
 #define PULSE_1MS   (1000)      // 1ms pulse width