diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp
index 99cba6c902..6cecfb0ee6 100644
--- a/src/vehiclelist.cpp
+++ b/src/vehiclelist.cpp
@@ -50,9 +50,8 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine
 
 		if (type == VehicleType::Train) {
 			const Train *t = Train::From(v);
-			if (t->IsArticulatedPart()) continue;
 			if (wagons != nullptr && t->First()->IsFreeWagon()) {
-				if (individual_wagons || t->IsFreeWagon()) wagons->push_back(t);
+				if (!t->IsArticulatedPart() && (individual_wagons || t->IsFreeWagon())) wagons->push_back(t);
 				continue;
 			}
 		}