diff --git a/klippy/gcode.py b/klippy/gcode.py
index 8fa6813c9..4158007f5 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -393,6 +393,12 @@ class GCodeParser:
             # Tn command has to be handled specially
             self.cmd_Tn(params)
             return
+        elif cmd.startswith("M117 "):
+            # Handle M117 gcode with numeric and special characters
+            handler = self.gcode_handlers.get("M117", None)
+            if handler is not None:
+                handler(params)
+                return
         self.respond_info('Unknown command:"%s"' % (cmd,))
     def cmd_Tn(self, params):
         # Select Tool