diff --git a/src/k_kart.c b/src/k_kart.c
index cbb0e6d53..d0c387a90 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8358,7 +8358,7 @@ static waypoint_t *K_GetPlayerNextWaypoint(player_t *player)
 
 	if ((player != NULL) && (player->mo != NULL) && (P_MobjWasRemoved(player->mo) == false))
 	{
-		waypoint_t *waypoint     = K_GetBestWaypointForMobj(player->mo, NULL);
+		waypoint_t *waypoint     = K_GetBestWaypointForMobj(player->mo, player->currentwaypoint);
 		boolean    updaterespawn = false;
 
 		// Our current waypoint.