diff --git a/Grbl_Esp32/Grbl_Esp32.ino b/Grbl_Esp32/Grbl_Esp32.ino
index 37b12fee..8c7d757a 100644
--- a/Grbl_Esp32/Grbl_Esp32.ino
+++ b/Grbl_Esp32/Grbl_Esp32.ino
@@ -118,7 +118,7 @@ void loop() {
     // Reset Grbl primary systems.
     serial_reset_read_buffer(CLIENT_ALL); // Clear serial read buffer
     gc_init(); // Set g-code parser to default state
-    //spindle_select(SPINDLE_TYPE);
+    spindle->stop();
     coolant_init();
     limits_init();
     probe_init();
diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h
index 53ced84e..379babf2 100644
--- a/Grbl_Esp32/grbl.h
+++ b/Grbl_Esp32/grbl.h
@@ -22,7 +22,7 @@
 // Grbl versioning system
 
 #define GRBL_VERSION "1.2a"
-#define GRBL_VERSION_BUILD "20200507"
+#define GRBL_VERSION_BUILD "20200510"
 
 //#include <sdkconfig.h>
 #include <Arduino.h>