diff --git a/src/waypoint.cpp b/src/waypoint.cpp
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -57,7 +57,7 @@ Station *ComposeWaypointStation(TileInde
 	static Station &stat = *(Station*)stat_raw;
 
 	stat.train_tile = stat.xy = wp->xy;
-	stat.town = Town::Get(wp->town_index);
+	stat.town = wp->town;
 	stat.build_date = wp->build_date;
 
 	return &stat;