diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.hpp
@@ -410,7 +410,9 @@ no_entry_cost: // jump here at the begin
 				end_segment_reason |= ESRB_DEPOT;
 
 			} else if (cur.tile_type == MP_STATION && IsRailWaypoint(cur.tile)) {
-				if (v->current_order.IsType(OT_GOTO_WAYPOINT) && GetStationIndex(cur.tile) == v->current_order.GetDestination()) {
+				if (v->current_order.IsType(OT_GOTO_WAYPOINT) &&
+						GetStationIndex(cur.tile) == v->current_order.GetDestination() &&
+						!Waypoint::Get(v->current_order.GetDestination())->IsSingleTile()) {
 					/* This waypoint is our destination; maybe this isn't an unreserved
 					 * one, so check that and if so see that as the last signal being
 					 * red. This way waypoints near stations should work better. */