diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo
index e71fe751..2bb9f163 100644
Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ
diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf
index e91ae96f..6a1ac8dc 100644
--- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf
+++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf
@@ -28,10 +28,12 @@ params [["_vehicle",objnull],["_items",[]]];
 private ["_subcontainersuffix"];
 _subcontainersuffix = [];
 
-clearweaponcargoglobal _vehicle;
-clearitemcargoglobal _vehicle;
-clearmagazinecargoglobal _vehicle;
-clearbackpackcargoglobal _vehicle;
+if !(_vehicle iskindof "weaponholder") then {
+	clearweaponcargoglobal _vehicle;
+	clearitemcargoglobal _vehicle;
+	clearmagazinecargoglobal _vehicle;
+	clearbackpackcargoglobal _vehicle;
+};
 
 {
 	_objType = _forEachIndex;