diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index 6b677fcf0f..4529dc50aa 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -289,12 +289,6 @@ void AfterLoadVehicles(bool part_of_load)
 					}
 				}
 			}
-
-			/* In some old savegames there might be some "crap" stored. */
-			if (IsSavegameVersionBefore(160) && !v->IsPrimaryVehicle()) {
-				v->current_order.Free();
-				v->unitnumber = 0;
-			}
 		}
 	}
 
@@ -336,6 +330,16 @@ void AfterLoadVehicles(bool part_of_load)
 				}
 			}
 		}
+
+		if (IsSavegameVersionBefore(160)) {
+			/* In some old savegames there might be some "crap" stored. */
+			FOR_ALL_VEHICLES(v) {
+				if (!v->IsPrimaryVehicle()) {
+					v->current_order.Free();
+					v->unitnumber = 0;
+				}
+			}
+		}
 	}
 
 	CheckValidVehicles();