diff --git a/src/pbs.cpp b/src/pbs.cpp
--- a/src/pbs.cpp
+++ b/src/pbs.cpp
@@ -26,7 +26,7 @@ TrackBits GetReservedTrackbits(TileIndex
 			break;
 
 		case MP_STATION:
-			if (IsRailwayStation(t)) return GetStationReservationTrackBits(t);
+			if (IsRailwayStation(t) || IsRailWaypoint(t)) return GetStationReservationTrackBits(t);
 			break;
 
 		case MP_TUNNELBRIDGE:
@@ -99,7 +99,7 @@ bool TryReserveRailTrack(TileIndex tile,
 			break;
 
 		case MP_STATION:
-			if (IsRailwayStation(tile) && !HasStationReservation(tile)) {
+			if ((IsRailwayStation(tile) || IsRailWaypoint(tile)) && !HasStationReservation(tile)) {
 				SetRailwayStationReservation(tile, true);
 				MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track
 				return true;
@@ -150,7 +150,7 @@ bool TryReserveRailTrack(TileIndex tile,
 			break;
 
 		case MP_STATION:
-			if (IsRailwayStation(tile)) {
+			if (IsRailwayStation(tile) || IsRailWaypoint(tile)) {
 				SetRailwayStationReservation(tile, false);
 				MarkTileDirtyByTile(tile);
 			}