diff --git a/klippy/gcode.py b/klippy/gcode.py
index 6cee4570..3db0e377 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -395,6 +395,8 @@ class GCodeParser:
             raise error(str(e))
         self.extruder = e
         self.reset_last_position()
+        self.extrude_factor = 1.
+        self.base_position[3] = self.last_position[3]
         self.run_script(self.extruder.get_activate_gcode(True))
     def cmd_mux(self, params):
         key, values = self.mux_commands[params['#command']]