diff --git a/src/newgrf_roadstop.h b/src/newgrf_roadstop.h
index 89111b5c62..9bd8a120b3 100644
--- a/src/newgrf_roadstop.h
+++ b/src/newgrf_roadstop.h
@@ -188,7 +188,7 @@ void RoadStopUpdateCachedTriggers(BaseStation *st);
  */
 inline bool IsWaypointClass(const RoadStopClass &cls)
 {
-	return cls.global_id == ROADSTOP_CLASS_LABEL_WAYPOINT;
+	return cls.global_id == ROADSTOP_CLASS_LABEL_WAYPOINT || GB(cls.global_id, 24, 8) == UINT8_MAX;
 }
 
 #endif /* NEWGRF_ROADSTATION_H */
diff --git a/src/newgrf_station.h b/src/newgrf_station.h
index 225fd0fd51..28fecb62ee 100644
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -188,7 +188,7 @@ const StationSpec *GetStationSpec(TileIndex t);
  */
 inline bool IsWaypointClass(const StationClass &cls)
 {
-	return cls.global_id == STATION_CLASS_LABEL_WAYPOINT;
+	return cls.global_id == STATION_CLASS_LABEL_WAYPOINT || GB(cls.global_id, 24, 8) == UINT8_MAX;
 }
 
 /* Evaluate a tile's position within a station, and return the result a bitstuffed format. */