diff --git a/klippy/gcode.py b/klippy/gcode.py
index 4e7c9af5c..9902ec4c7 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -228,6 +228,7 @@ class GCodeParser:
             self.toolhead.move(self.last_position, self.speed, sloppy)
         except homing.EndstopError, e:
             self.respond("Error: %s" % (e,))
+            self.last_position = self.toolhead.get_position()
     def cmd_G4(self, params):
         # Dwell
         if 'S' in params: