diff --git a/driver_opts.h b/driver_opts.h
index f5ba56e..0cbf0ff 100644
--- a/driver_opts.h
+++ b/driver_opts.h
@@ -333,10 +333,11 @@
 #define SPINDLE3_ENABLE     0
 #elif SPINDLE3_ENABLE == -1 || SPINDLE3_ENABLE == SPINDLE_ALL || SPINDLE3_ENABLE == SPINDLE_ALL_VFD
 #warning "SPINDLE3_ENABLE cannot be set to -1, SPINDLE_ALL or SPINDLE_ALL_VFD"
-#undef SPINDLE1_ENABLE
-#define SPINDLE1_ENABLE     0
+#undef SPINDLE3_ENABLE
+#define SPINDLE3_ENABLE     0
 #endif
 
+#ifndef SPINDLE_ENABLE
 #if SPINDLE0_ENABLE == -1 || SPINDLE0_ENABLE == SPINDLE_ALL
 #define SPINDLE_ENABLE (SPINDLE_ALL|(1<<SPINDLE1_ENABLE)|(1<<SPINDLE2_ENABLE)|(1<<SPINDLE3_ENABLE))
 #elif SPINDLE0_ENABLE == SPINDLE_ALL_VFD
@@ -344,6 +345,7 @@
 #else
 #define SPINDLE_ENABLE ((1<<SPINDLE0_ENABLE)|(1<<SPINDLE1_ENABLE)|(1<<SPINDLE2_ENABLE)|(1<<SPINDLE3_ENABLE))
 #endif
+#endif
 
 // Driver spindle 0