diff --git a/train_cmd.c b/train_cmd.c
index 1179c2958f..a38c9d02ed 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -48,11 +48,11 @@ static const byte _state_dir_table[4] = { 0x20, 8, 0x10, 4 };
 static void TrainCargoChanged(Vehicle* v)
 {
 	Vehicle *u;
-	uint16 weight = 0;
+	uint32 weight = 0;
 
 	for (u = v; u != NULL; u = u->next) {
 		const RailVehicleInfo *rvi = RailVehInfo(u->engine_type);
-		uint16 vweight = (_cargoc.weights[u->cargo_type] * u->cargo_count) / 16;
+		uint32 vweight = (_cargoc.weights[u->cargo_type] * u->cargo_count) / 16;
 
 		// Vehicle weight is not added for articulated parts.
 		if (!IsArticulatedPart(u)) {
diff --git a/vehicle.h b/vehicle.h
index 7681b9de99..b4e1a7190e 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -54,8 +54,8 @@ typedef struct VehicleRail {
 	uint16 cached_total_length; ///< Length of the whole train, valid only for first engine.
 
 	// cached values, recalculated when the cargo on a train changes (in addition to the conditions above)
-	uint16 cached_weight;     // total weight of the consist.
-	uint16 cached_veh_weight; // weight of the vehicle.
+	uint32 cached_weight;     // total weight of the consist.
+	uint32 cached_veh_weight; // weight of the vehicle.
 	/**
 	 * Position/type of visual effect.
 	 * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear)