diff --git a/src/modules/tools/spindle/PWMSpindleControl.cpp b/src/modules/tools/spindle/PWMSpindleControl.cpp
index ba59356e..6ea7313c 100644
--- a/src/modules/tools/spindle/PWMSpindleControl.cpp
+++ b/src/modules/tools/spindle/PWMSpindleControl.cpp
@@ -246,8 +246,7 @@ void PWMSpindleControl::turn_off() {
 
 void PWMSpindleControl::set_speed(int rpm) {
     if (rpm > max_rpm){
-        max_rpm = rpm;
-        return;
+        rpm = max_rpm;
     }
     target_rpm = rpm;
 }
diff --git a/version.txt b/version.txt
index 0359fe88..856b0fad 100644
--- a/version.txt
+++ b/version.txt
@@ -16,6 +16,7 @@
 - Fixed: "!" is not filtered anymore when not at the beginning of the line. This enables configuration of inverted pins over the config-set command. (e.g. config-set sd atc.detector.detect_pin 0.21!^)
 - Fixed: Manual toolchanges after starting a file on an atc machine should work correctly now
 - Fixed: Changing to the laser on an air with an atc works now
+- Fixed: Clamping the spindle rpm to the max rpm fixed
 - Change: added -Slow parameter to windows powershell build script to improve readability of error logs as the cost of speed.
 - Change: removed register specifiers in LPC1768 and mbded libraries used by the project. register has been depreciated for a long time and now falls back to being completely ignored. Looked for library updates first, they haven't been updated.
 - Enhancement: New config setting "zprobe.three_axis_probe_tlo_correction" allows the user to correct for tlo measurement inaccuracies