diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp
index 18d3662975..ebfa9a6a71 100644
--- a/src/yapf/yapf_costrail.hpp
+++ b/src/yapf/yapf_costrail.hpp
@@ -438,7 +438,7 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th
 				}
 
 				if (TrackFollower::MaskReservedTracks() && tf_local.m_err != TrackFollower::EC_90DEG) {
-					end_segment_reason |= ESRB_SAFE_TILE;
+					if (!HasOnewaySignalBlockingTrackdir(cur.tile, cur.td)) end_segment_reason |= ESRB_SAFE_TILE;
 				}
 				break;
 			}