diff --git a/configs/STELLARF4V2/config.h b/configs/STELLARF4V2/config.h
index a0775806b..38717f068 100644
--- a/configs/STELLARF4V2/config.h
+++ b/configs/STELLARF4V2/config.h
@@ -50,13 +50,13 @@
 #define MOTOR2_PIN          PC8 // TIM8 CH3 (AF3) DMA2 Stream 4 Channel 7
 #define MOTOR3_PIN          PC7 // TIM8 CH2 (AF3) DMA2 Stream 3 Channel 7
 #define MOTOR4_PIN          PC6 // TIM8 CH1 (AF3) DMA2 Stream 2 Channel 7
-#define MOTOR5_PIN          PB6 // or SERVO TIM4 CH1 (AF2)
-#define MOTOR6_PIN          PB7 // or SERVO TIM4 CH2 (AF2)
-#define MOTOR7_PIN          PB8 // or SERVO TIM4 CH3 (AF2)
-#define MOTOR8_PIN          PB9 // or SERVO TIM4 CH4 (AF2)
-#define SERVO1_PIN          PA9 // TIM1 CH2 (AF1)
-#define SERVO2_PIN          PA10 // TIM1 CH3 (AF1) or UART1_RX_PIN
-#define SERVO3_PIN          PA8 // TIM1 CH1 (AF1) or UART1_TX_PIN
+#define SERVO1_PIN          PB6 // TIM4 CH1 (AF2)
+#define SERVO2_PIN          PB7 // TIM4 CH2 (AF2)
+#define SERVO3_PIN          PB8 // TIM4 CH3 (AF2)
+#define SERVO4_PIN          PB9 // TIM4 CH4 (AF2)
+#define SERVO5_PIN          PA9 // TIM1 CH2 (AF1)
+#define SERVO6_PIN          PA10 // TIM1 CH3 (AF1) or UART1_RX_PIN
+#define SERVO7_PIN          PA8 // TIM1 CH1 (AF1) or UART1_TX_PIN
 #define RX_PPM_PIN          PA3 // TIM5 CH4 (AF2) DMA1 Stream 1 Channel 6
 #define UART2_TX_PIN        PA2
 #define UART3_TX_PIN        PC10
@@ -91,10 +91,10 @@
                             TIMER_PIN_MAP( 1,  PC8,  2,  1 ) \
                             TIMER_PIN_MAP( 2,  PC7,  2,  1 ) \
                             TIMER_PIN_MAP( 3,  PC6,  2,  1 ) \
-                            TIMER_PIN_MAP( 4,  PB6,  1,  0 ) \
-                            TIMER_PIN_MAP( 5,  PB7,  1,  0 ) \
-                            TIMER_PIN_MAP( 6,  PB8,  1,  0 ) \
-                            TIMER_PIN_MAP( 7,  PB9,  1,  0 ) \
+                            TIMER_PIN_MAP( 4,  PB6,  1, -1 ) \
+                            TIMER_PIN_MAP( 5,  PB7,  1, -1 ) \
+                            TIMER_PIN_MAP( 6,  PB8,  1, -1 ) \
+                            TIMER_PIN_MAP( 7,  PB9,  1, -1 ) \
                             TIMER_PIN_MAP( 8,  PA9,  1, -1 ) \
                             TIMER_PIN_MAP( 9,  PA10, 1, -1 ) \
                             TIMER_PIN_MAP( 10, PA8,  1, -1 ) \