diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h
index 550fbcc5..3f949aae 100644
--- a/Grbl_Esp32/src/Grbl.h
+++ b/Grbl_Esp32/src/Grbl.h
@@ -22,7 +22,7 @@
 
 // Grbl versioning system
 const char* const GRBL_VERSION       = "1.3a";
-const char* const GRBL_VERSION_BUILD = "20210413";
+const char* const GRBL_VERSION_BUILD = "20210419";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>
diff --git a/Grbl_Esp32/src/Spindles/VFDSpindle.cpp b/Grbl_Esp32/src/Spindles/VFDSpindle.cpp
index 4e9d949a..463a0933 100644
--- a/Grbl_Esp32/src/Spindles/VFDSpindle.cpp
+++ b/Grbl_Esp32/src/Spindles/VFDSpindle.cpp
@@ -567,6 +567,10 @@ namespace Spindles {
 
         set_speed_command(rpm, rpm_cmd);
 
+        // Sometimes sync_rpm is retained between different set_speed_command's. We don't want that - we want 
+        // spindle sync to kick in after we set the speed. This forces that.
+        _sync_rpm = UINT32_MAX;
+
         rpm_cmd.critical = (rpm == 0);
 
         if (xQueueSend(vfd_cmd_queue, &rpm_cmd, 0) != pdTRUE) {