diff --git a/Grbl_Esp32/SettingsDefinitions.cpp b/Grbl_Esp32/SettingsDefinitions.cpp
index d7a0f7a7..4214acda 100644
--- a/Grbl_Esp32/SettingsDefinitions.cpp
+++ b/Grbl_Esp32/SettingsDefinitions.cpp
@@ -311,6 +311,6 @@ void make_settings() {
     step_invert_mask = new AxisMaskSetting(GRBL, WG, "2", "Stepper/StepInvert", DEFAULT_STEPPING_INVERT_MASK);
     stepper_idle_lock_time = new IntSetting(GRBL, WG, "1", "Stepper/IdleTime", DEFAULT_STEPPER_IDLE_LOCK_TIME, 0, 255);
     pulse_microseconds = new IntSetting(GRBL, WG, "0", "Stepper/Pulse", DEFAULT_STEP_PULSE_MICROSECONDS, 3, 1000);
-    spindle_type = new EnumSetting(NULL, EXTENDED, WG, NULL, "Spindle/Type", SPINDLE_TYPE_NONE, &spindleTypes);
+    spindle_type = new EnumSetting(NULL, EXTENDED, WG, NULL, "Spindle/Type", SPINDLE_TYPE, &spindleTypes);
     stallguard_debug_mask = new AxisMaskSetting(EXTENDED, WG, NULL, "Report/StallGuard", 0, checkStallguardDebugMask);
 }
diff --git a/Grbl_Esp32/defaults.h b/Grbl_Esp32/defaults.h
index 438dd6cd..1b9b34f9 100644
--- a/Grbl_Esp32/defaults.h
+++ b/Grbl_Esp32/defaults.h
@@ -115,6 +115,10 @@
     #endif
 
     // ======== SPINDLE STUFF ====================
+    #ifndef SPINDLE_TYPE
+        #define SPINDLE_TYPE SPINDLE_TYPE_NONE
+    #endif
+
     #ifndef  DEFAULT_SPINDLE_RPM_MIN // $31
         #define DEFAULT_SPINDLE_RPM_MIN 0.0 // rpm
     #endif