diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 9fb0d3cda2..545a9f92e5 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -550,6 +550,7 @@ int32 CmdRefitAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		u = v->next;
 		mail = (new_cid != CT_PASSENGERS) ? 0 : avi->mail_capacity;
 		u->cargo_cap = mail;
+		v->cargo_count = u->cargo_count = 0;
 		v->cargo_type = new_cid;
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	}
diff --git a/ship_cmd.c b/ship_cmd.c
index a75394e741..30f68c014f 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1092,6 +1092,7 @@ int32 CmdRefitShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	}
 
 	if (flags & DC_EXEC) {
+		v->cargo_count = 0;
 		v->cargo_type = new_cid;
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	}