diff --git a/src/main/target/FLYWOOF745/config.c b/src/main/target/FLYWOOF745/config.c
index 07f6de4697..7dfe40728d 100644
--- a/src/main/target/FLYWOOF745/config.c
+++ b/src/main/target/FLYWOOF745/config.c
@@ -22,7 +22,16 @@
 
 #include "io/piniobox.h"
 
+#include "drivers/pwm_output.h"
+#include "drivers/pwm_mapping.h"
+
 void targetConfiguration(void)
 {
     pinioBoxConfigMutable()->permanentId[0] = BOX_PERMANENT_ID_USER1;
+
+    // Make sure S1-S4 default to Motors
+
+    timerOverridesMutable(timer2id(TIM3))->outputMode = OUTPUT_MODE_MOTORS;
+    timerOverridesMutable(timer2id(TIM8))->outputMode = OUTPUT_MODE_MOTORS;
+    timerOverridesMutable(timer2id(TIM1))->outputMode = OUTPUT_MODE_MOTORS;
 }
diff --git a/src/main/target/FLYWOOF745/target.c b/src/main/target/FLYWOOF745/target.c
index 5ad1d7dd03..a82a708f51 100644
--- a/src/main/target/FLYWOOF745/target.c
+++ b/src/main/target/FLYWOOF745/target.c
@@ -32,15 +32,15 @@
 timerHardware_t timerHardware[] = {
     // DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM,                      0, 1), // PPM, DMA2_ST6
 
-    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO,    0, 0), // M2 , DMA1_ST2
-    DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO,    0, 0), // M5 , DMA2_ST7
-    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO,    0, 0), // M1 , DMA1_ST7
+    DEF_TIM(TIM3, CH4, PB1,  TIM_USE_OUTPUT_AUTO,    0, 0), // M1 , DMA1_ST2
+    DEF_TIM(TIM8, CH4, PC9,  TIM_USE_OUTPUT_AUTO,    0, 0), // M2 , DMA2_ST7
+    DEF_TIM(TIM3, CH3, PB0,  TIM_USE_OUTPUT_AUTO,    0, 0), // M3 , DMA1_ST7
     DEF_TIM(TIM1, CH2, PE11, TIM_USE_OUTPUT_AUTO,    0, 1), // M4 , DMA2_ST4
-    DEF_TIM(TIM1, CH1, PE9,  TIM_USE_OUTPUT_AUTO,    0, 2), // M3 , DMA2_ST2
+    DEF_TIM(TIM1, CH1, PE9,  TIM_USE_OUTPUT_AUTO,    0, 2), // M5 , DMA2_ST2
     DEF_TIM(TIM5, CH4, PA3,  TIM_USE_OUTPUT_AUTO,    0, 0), // M6 , DMA1_ST1
     DEF_TIM(TIM3, CH1, PB4,  TIM_USE_OUTPUT_AUTO,    0, 0), // M7 , DMA1_ST4
     DEF_TIM(TIM3, CH2, PB5,  TIM_USE_OUTPUT_AUTO,    0, 0), // M8 , DMA1_ST5
-    DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED,                      0, 0), // LED_STRIP, DMA1_ST0
+    DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED,            0, 0), // LED_STRIP, DMA1_ST0
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);