diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp
--- a/src/yapf/yapf_costrail.hpp
+++ b/src/yapf/yapf_costrail.hpp
@@ -406,7 +406,7 @@ no_entry_cost: // jump here at the begin
 				/* We will end in this pass (station is possible target) */
 				end_segment_reason |= ESRB_STATION;
 
-			} else if (cur.tile_type == MP_RAILWAY && IsRailWaypoint(cur.tile)) {
+			} else if (cur.tile_type == MP_STATION && IsRailWaypoint(cur.tile)) {
 				/* Waypoint is also a good reason to finish. */
 				end_segment_reason |= ESRB_WAYPOINT;
 			} else if (TrackFollower::DoTrackMasking() && cur.tile_type == MP_RAILWAY) {