diff --git a/src/battle/hud.c b/src/battle/hud.c
index e0d861b..bef5fce 100644
--- a/src/battle/hud.c
+++ b/src/battle/hud.c
@@ -293,7 +293,7 @@ static void drawTargetsRects(void)
 		SDL_RenderDrawRect(app.renderer, &r);
 	}
 	
-	if (battle.missionTarget && battle.missionTarget->type != ET_WAYPOINT)
+	if (battle.missionTarget && (battle.missionTarget->flags & EF_NO_MT_BOX) == 0)
 	{
 		r.x = battle.missionTarget->x - 28 - battle.camera.x;
 		r.y = battle.missionTarget->y - 28 - battle.camera.y;
diff --git a/src/battle/waypoints.c b/src/battle/waypoints.c
index a2f24e5..56423eb 100644
--- a/src/battle/waypoints.c
+++ b/src/battle/waypoints.c
@@ -42,6 +42,7 @@ Entity *spawnWaypoint(void)
 	waypoint->texture = getTexture("gfx/entities/waypoint.png");
 	waypoint->flags = EF_MISSION_TARGET;
 	waypoint->action = think;
+	waypoint->flags |= EF_NO_MT_BOX;
 	
 	return waypoint;
 }