diff --git a/rail_cmd.c b/rail_cmd.c
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -665,7 +665,7 @@ int32 CmdBuildTrainDepot(int x, int y, u
 		d->xy = tile;
 		d->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 
-		SetSignalsOnBothDir(tile, (p2 & 1) ? 2 : 1);
+		UpdateSignalsOnSegment(tile, p2);
 	}
 
 	return cost + _price.build_train_depot;
@@ -1023,10 +1023,10 @@ static int32 RemoveTrainDepot(TileIndex 
 		return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
-		Track track = TrackdirToTrack(DiagdirToDiagTrackdir(GetRailDepotDirection(tile)));
+		DiagDirection dir = GetRailDepotDirection(tile);
 
 		DoDeleteDepot(tile);
-		SetSignalsOnBothDir(tile, track);
+		UpdateSignalsOnSegment(tile, dir);
 	}
 
 	return _price.remove_train_depot;
diff --git a/train_cmd.c b/train_cmd.c
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -3282,12 +3282,9 @@ void Train_Tick(Vehicle *v)
 }
 
 
-static const byte _depot_track_ind[4] = {0,1,0,1};
-
-
 void TrainEnterDepot(Vehicle *v, TileIndex tile)
 {
-	SetSignalsOnBothDir(tile, _depot_track_ind[GetRailDepotDirection(tile)]);
+	UpdateSignalsOnSegment(tile, GetRailDepotDirection(tile));
 
 	if (!IsFrontEngine(v)) v = GetFirstVehicleInChain(v);