diff --git a/ArduPlane/commands_logic.pde b/ArduPlane/commands_logic.pde
index f21a2ef225..aee57bb671 100644
--- a/ArduPlane/commands_logic.pde
+++ b/ArduPlane/commands_logic.pde
@@ -304,6 +304,7 @@ static bool verify_takeoff()
     if (current_loc.alt > takeoff_altitude)  {
         hold_course = -1;
         takeoff_complete = true;
+        next_WP = current_loc;
         return true;
     } else {
         return false;