diff --git a/klippy/gcode.py b/klippy/gcode.py
index ca176ed0ccb5..975da792b4fd 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -35,7 +35,7 @@ def get_raw_command_parameters(self):
             # Skip any gcode line-number and ignore any trailing checksum
             param_start += origline.upper().find(command)
             end = origline.rfind('*')
-            if end >= 0:
+            if end >= 0 and origline[end+1:].isdigit():
                 param_end = end
         if origline[param_start:param_start+1].isspace():
             param_start += 1