diff --git a/src/main/drivers/pwm_mapping.c b/src/main/drivers/pwm_mapping.c
index 1466aa2d25..bc9336cbee 100755
--- a/src/main/drivers/pwm_mapping.c
+++ b/src/main/drivers/pwm_mapping.c
@@ -109,7 +109,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
 #else
     setup = hardwareMaps[i];
 #endif
-
+	TIM_TypeDef* ppmTimer = NULL;
     for (i = 0; i < USABLE_TIMER_CHANNEL_COUNT && setup[i] != 0xFFFF; i++) {
         uint8_t timerIndex = setup[i] & 0x00FF;
         uint8_t type = (setup[i] & 0xFF00) >> 8;
@@ -162,13 +162,13 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
         }
 #endif
 
-#ifdef RSSI_ADC_GPIO
+#ifdef RSSI_ADC_PIN
         if (init->useRSSIADC && timerHardwarePtr->tag == IO_TAG(RSSI_ADC_PIN)) {
             continue;
         }
 #endif
 
-#ifdef CURRENT_METER_ADC_GPIO
+#ifdef CURRENT_METER_ADC_PIN
         if (init->useCurrentMeterADC && timerHardwarePtr->tag == IO_TAG(CURRENT_METER_ADC_PIN)) {
             continue;
         }
@@ -292,11 +292,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
 
         if (type == MAP_TO_PPM_INPUT) {
 #ifndef SKIP_RX_PWM_PPM
-#if defined(SPARKY) || defined(ALIENFLIGHTF3)
-            if (!(init->pwmProtocolType == PWM_TYPE_CONVENTIONAL)) {
-                ppmAvoidPWMTimerClash(timerHardwarePtr, TIM2, init->pwmProtocolType);
-            }
-#endif
+            ppmTimer = timerHardwarePtr->tim;
             ppmInConfig(timerHardwarePtr);
 #endif
         } else if (type == MAP_TO_PWM_INPUT) {
@@ -313,9 +309,15 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
                     continue;
             }
 #endif
+            if (init->usePPM) {
+                if (init->pwmProtocolType != PWM_TYPE_CONVENTIONAL && timerHardwarePtr->tim == ppmTimer) {
+                    ppmAvoidPWMTimerClash(timerHardwarePtr, ppmTimer, init->pwmProtocolType);
+                }
+            }
+
             if (init->useFastPwm) {
                 pwmFastPwmMotorConfig(timerHardwarePtr, pwmOutputConfiguration.motorCount, init->motorPwmRate, init->idlePulse, init->pwmProtocolType);
-                pwmOutputConfiguration.portConfigurations[pwmOutputConfiguration.outputCount].flags = PWM_PF_MOTOR | PWM_PF_OUTPUT_PROTOCOL_PWM  | PWM_PF_OUTPUT_PROTOCOL_ONESHOT;
+                pwmOutputConfiguration.portConfigurations[pwmOutputConfiguration.outputCount].flags = PWM_PF_MOTOR | PWM_PF_OUTPUT_PROTOCOL_PWM | PWM_PF_OUTPUT_PROTOCOL_ONESHOT;
             } else if (init->pwmProtocolType == PWM_TYPE_BRUSHED) {
                 pwmBrushedMotorConfig(timerHardwarePtr, pwmOutputConfiguration.motorCount, init->motorPwmRate);
                 pwmOutputConfiguration.portConfigurations[pwmOutputConfiguration.outputCount].flags = PWM_PF_MOTOR | PWM_PF_OUTPUT_PROTOCOL_PWM | PWM_PF_MOTOR_MODE_BRUSHED;
diff --git a/src/main/target/REVO/target.c b/src/main/target/REVO/target.c
index e33f1a58c8..065e0d0f71 100644
--- a/src/main/target/REVO/target.c
+++ b/src/main/target/REVO/target.c
@@ -20,6 +20,7 @@
 #include <platform.h>
 #include "drivers/io.h"
 #include "drivers/pwm_mapping.h"
+#include "drivers/timer.h"
 
 const uint16_t multiPPM[] = {
     PWM1  | (MAP_TO_PPM_INPUT     << 8),  // PPM input
@@ -29,11 +30,11 @@ const uint16_t multiPPM[] = {
     PWM10 | (MAP_TO_MOTOR_OUTPUT  << 8),
     PWM11 | (MAP_TO_MOTOR_OUTPUT  << 8),
     PWM12 | (MAP_TO_MOTOR_OUTPUT  << 8),
-    PWM2  | (MAP_TO_MOTOR_OUTPUT  << 8),  // Swap to servo if needed
-    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
+    PWM2  | (MAP_TO_SERVO_OUTPUT  << 8),  // Swap to servo if needed
+    PWM3  | (MAP_TO_SERVO_OUTPUT  << 8),  // Swap to servo if needed
+    PWM4  | (MAP_TO_SERVO_OUTPUT  << 8),  // Swap to servo if needed
+    PWM5  | (MAP_TO_SERVO_OUTPUT  << 8),  // Swap to servo if needed
+    PWM6  | (MAP_TO_SERVO_OUTPUT  << 8),  // Swap to servo if needed
     0xFFFF
 };