diff --git a/python/port/mod/turtle/turtle.cpp b/python/port/mod/turtle/turtle.cpp
index 0b7dcad89..7a66d4240 100644
--- a/python/port/mod/turtle/turtle.cpp
+++ b/python/port/mod/turtle/turtle.cpp
@@ -118,8 +118,8 @@ bool Turtle::goTo(mp_float_t x, mp_float_t y) {
        * the computation of the position on the principal coordinate is done
        * using a barycenter, roundings might skip some pixels, which results in
        * a dotted line. */
-      mp_float_t currentX = principalDirection == PrincipalDirection::Y ? x * progress + oldx * (1 - progress) : oldx + (x > oldx ? i : -i);
-      mp_float_t currentY = principalDirection == PrincipalDirection::X ? y * progress + oldy * (1 - progress) : oldy + (y > oldy ? i : -i);
+      mp_float_t currentX = xLength == 0 ? x : (principalDirection == PrincipalDirection::Y ? x * progress + oldx * (1 - progress) : oldx + (x > oldx ? i : -i));
+      mp_float_t currentY = yLength == 0 ? y : (principalDirection == PrincipalDirection::X ? y * progress + oldy * (1 - progress) : oldy + (y > oldy ? i : -i));
       if (dot(currentX, currentY) || draw(false)) {
         // Keyboard interruption. Return now to let MicroPython process it.
         return true;