diff --git a/src/k_kart.c b/src/k_kart.c
index 8cc8e418..4f04f46a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2576,6 +2576,9 @@ static void K_KartUpdatePosition(player_t *player)
 
 					mo = (mobj_t *)th;
 
+					if (mo->type != MT_BOSS3WAYPOINT) // TODO: Change to 'MT_WAYPOINT'?
+						continue;
+
 					pmo = P_AproxDistance(P_AproxDistance(	mo->x - player->mo->x,
 															mo->y - player->mo->y),
 															mo->z - player->mo->z) / FRACUNIT;
@@ -2583,9 +2586,6 @@ static void K_KartUpdatePosition(player_t *player)
 															mo->y - players[i].mo->y),
 															mo->z - players[i].mo->z) / FRACUNIT;
 
-					if (mo->type != MT_BOSS3WAYPOINT) // TODO: Change to 'MT_WAYPOINT'?
-						continue;
-
 					if (mo->health == player->starpostnum)
 					{
 						player->kartstuff[k_prevcheck] += pmo;