diff --git a/src/main/drivers/pwm_mapping.c b/src/main/drivers/pwm_mapping.c
index 6ba8369bc2..d1cfcbda15 100755
--- a/src/main/drivers/pwm_mapping.c
+++ b/src/main/drivers/pwm_mapping.c
@@ -244,10 +244,6 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
                 if ((timerIndex == PWM13 || timerIndex == PWM14) && timerHardwarePtr->tim == TIM15)
                     type = MAP_TO_SERVO_OUTPUT;
             }
-
-            // skip UART3 ports when necessary - this board maps UART3 and PWM3,PWM4 to the same pins
-            if ((init->useUART3) && (timerIndex == PWM3 || timerIndex == PWM4))
-                continue;
 #endif
 
 #if defined(SPRACINGF3MINI) || defined(OMNIBUS)
@@ -308,11 +304,8 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
                 if (timerIndex >= PWM5 && timerIndex <= PWM8)
                     type = MAP_TO_SERVO_OUTPUT;
 #elif defined(X_RACERSPI)
-                // remap PWM3..6 as servos when used in extended servo mode ... except if using UART3
-                if (!init->useUART3 && (timerIndex >= PWM3 && timerIndex <= PWM4))
-                    type = MAP_TO_SERVO_OUTPUT;
-                // don't do this if softserial, but that's up above
-                if (timerIndex >= PWM5 && timerIndex <= PWM6)
+                // remap PWM3..6 as servos when used in extended servo mode
+                if (timerIndex >= PWM3 && timerIndex <= PWM6)
                     type = MAP_TO_SERVO_OUTPUT;
 #endif
 
diff --git a/src/main/target/X_RACERSPI/target.c b/src/main/target/X_RACERSPI/target.c
index 7d62709d65..2c3e1d547f 100644
--- a/src/main/target/X_RACERSPI/target.c
+++ b/src/main/target/X_RACERSPI/target.c
@@ -17,6 +17,8 @@ const uint16_t multiPPM[] = {
     PWM12 | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM13 | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM14 | (MAP_TO_MOTOR_OUTPUT << 8),
+    PWM3  | (MAP_TO_MOTOR_OUTPUT << 8),  // Swap to servo if needed
+    PWM4  | (MAP_TO_MOTOR_OUTPUT << 8),  // Swap to servo if needed
     PWM5  | (MAP_TO_MOTOR_OUTPUT << 8),  // Swap to servo if needed
     PWM6  | (MAP_TO_MOTOR_OUTPUT << 8),  // Swap to servo if needed
     0xFFFF
@@ -50,8 +52,10 @@ const uint16_t airPPM[] = {
     PWM12 | (MAP_TO_SERVO_OUTPUT  << 8),
     PWM13 | (MAP_TO_SERVO_OUTPUT  << 8),
     PWM14 | (MAP_TO_SERVO_OUTPUT  << 8),
+    PWM3  | (MAP_TO_SERVO_OUTPUT  << 8),
+    PWM4  | (MAP_TO_SERVO_OUTPUT  << 8),
     PWM5  | (MAP_TO_SERVO_OUTPUT  << 8),
-    PWM6  | (MAP_TO_SERVO_OUTPUT  << 8), // servo #8
+    PWM6  | (MAP_TO_SERVO_OUTPUT  << 8), // servo #10
     0xFFFF
 };