diff --git a/Grbl_Esp32/data/config.yaml b/Grbl_Esp32/data/config.yaml
index 6fe3603d..a7aacc03 100644
--- a/Grbl_Esp32/data/config.yaml
+++ b/Grbl_Esp32/data/config.yaml
@@ -68,9 +68,6 @@ axes:
       null_motor:
 
 comms:
-    wifi_sta:
-        ssid: Barts-WLAN
-
     wifi_ap:
         ip_address: "192.168.0.1"
         ssid: GRBL_ESP32
@@ -78,19 +75,12 @@ comms:
 probe:
     pin: gpio.32:low:pu
 
-Relay:
-  output_pin: gpio.21
-  spinup_ms: 1000
-  spindown_ms: 1000
-  tool: 0
-  speeds: 0=0.000% 0=0.000% 1000=100.000%
-
 PWM:
   pwm_freq: 5000
-  invert_pwm: false
-  output_pin: gpio.2
-  enable_pin: NO_PIN
+  output_pin: gpio.2:low
+  zero_speed_with_disable: true
+  enable_pin: gpio.21
   spinup_ms: 1000
   spindown_ms: 1000
-  speeds: 0=0% 0=20% 4000=20% 8000=30% 16000=100%
-  tool: 30
+  speeds: 0=0% 1000=100%
+  tool: 0
diff --git a/Grbl_Esp32/src/Spindles/OnOffSpindle.h b/Grbl_Esp32/src/Spindles/OnOffSpindle.h
index 704d23b5..57ded712 100644
--- a/Grbl_Esp32/src/Spindles/OnOffSpindle.h
+++ b/Grbl_Esp32/src/Spindles/OnOffSpindle.h
@@ -69,7 +69,7 @@ namespace Spindles {
         // _disable_with_zero_speed forces a disable when speed is 0
         bool _disable_with_zero_speed = false;
         // _zero_speed_with_disable forces speed to 0 when disabled
-        bool _zero_speed_with_disable = false;
+        bool _zero_speed_with_disable = true;
 
         virtual void set_output(uint32_t speed);
         virtual void deinit();