diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -193,6 +193,7 @@ CommandCost CmdBuildTrainWaypoint(TileIn
 		AllocateSpecToStation(GetCustomStationSpec(STAT_CLASS_WAYP, p1), wp, true);
 
 		wp->delete_ctr = 0;
+		wp->facilities |= FACIL_TRAIN;
 		wp->build_date = _date;
 
 		if (wp->town == NULL) MakeDefaultWaypointName(wp);
@@ -228,6 +229,7 @@ CommandCost RemoveTrainWaypoint(TileInde
 
 		wp->delete_ctr = 30; // let it live for this many days before we do the actual deletion.
 		wp->sign.MarkDirty();
+		wp->facilities &= ~FACIL_TRAIN;
 
 		Train *v = NULL;
 		if (justremove) {