diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2128,9 +2128,14 @@ static TrainFindDepotData FindClosestTra
 
 	TrainFindDepotData tfdd;
 	tfdd.owner = v->owner;
-	tfdd.best_length = UINT_MAX;
 	tfdd.reverse = false;
 
+	if (IsRailDepotTile(v->tile)) {
+		tfdd.tile = v->tile;
+		tfdd.best_length = 0;
+		return tfdd;
+	}
+
 	PBSTileInfo origin = FollowTrainReservation(v);
 	if (IsRailDepotTile(origin.tile)) {
 		tfdd.tile = origin.tile;
@@ -2138,6 +2143,8 @@ static TrainFindDepotData FindClosestTra
 		return tfdd;
 	}
 
+	tfdd.best_length = UINT_MAX;
+
 	uint8 pathfinder = _settings_game.pf.pathfinder_for_trains;
 	if ((_settings_game.pf.reserve_paths || HasReservedTracks(v->tile, v->u.rail.track)) && pathfinder == VPF_NTP) pathfinder = VPF_NPF;