diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 5c5b50988a..3f1e06deae 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1057,7 +1057,8 @@ void VehicleEnterDepot(Vehicle *v)
 			}
 		}
 
-		if (t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) {
+		if (t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS &&
+				(v->type == VEH_AIRCRAFT ? t.GetDestination() == GetStationIndex(v->tile) : v->dest_tile == v->tile)) {
 			/* Part of orders */
 			UpdateVehicleTimetable(v, true);
 			v->cur_order_index++;