diff --git a/klippy/extras/gcode_move.py b/klippy/extras/gcode_move.py
index 94a0ce42..655b8108 100644
--- a/klippy/extras/gcode_move.py
+++ b/klippy/extras/gcode_move.py
@@ -92,7 +92,7 @@ class GCodeMove:
     def _get_gcode_position(self):
         p = [lp - bp for lp, bp in zip(self.last_position, self.base_position)]
         p[3] /= self.extrude_factor
-        return p
+        return p[:4]
     def _get_gcode_speed(self):
         return self.speed / self.speed_factor
     def _get_gcode_speed_override(self):
@@ -107,7 +107,7 @@ class GCodeMove:
             'absolute_extrude': self.absolute_extrude,
             'homing_origin': self.Coord(*self.homing_position[:4]),
             'position': self.Coord(*self.last_position[:4]),
-            'gcode_position': self.Coord(*move_position[:4]),
+            'gcode_position': self.Coord(*move_position),
         }
     def reset_last_position(self):
         if self.is_printer_ready:
diff --git a/test/klippy/manual_stepper.test b/test/klippy/manual_stepper.test
index 6ab45c2d..12726411 100644
--- a/test/klippy/manual_stepper.test
+++ b/test/klippy/manual_stepper.test
@@ -33,6 +33,10 @@ G28
 G1 X20 Y20 Z10
 G1 A10 X22
 
+# Verify position query commands work with extra axis
+GET_POSITION
+M114
+
 # Test unregistering
 MANUAL_STEPPER STEPPER=basic_stepper GCODE_AXIS=
 G1 X15