diff --git a/lua/entities/acf_armor/init.lua b/lua/entities/acf_armor/init.lua
index 2a63862b..315d28e8 100644
--- a/lua/entities/acf_armor/init.lua
+++ b/lua/entities/acf_armor/init.lua
@@ -105,6 +105,8 @@ do -- Spawning and Updating
 		Plate.Owner     = Player -- MUST be stored on ent for PP
 		Plate.DataStore = Entities.GetArguments("acf_armor")
 
+		duplicator.ClearEntityModifier(Plate, "mass")
+
 		UpdatePlate(Plate, Data, Armor)
 
 		if Armor.OnSpawn then
@@ -113,14 +115,6 @@ do -- Spawning and Updating
 
 		hook.Run("ACF_OnEntitySpawn", "acf_armor", Plate, Data, Armor)
 
-		do -- Mass entity mod removal
-			local EntMods = Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
-
 		return Plate
 	end
 
diff --git a/lua/entities/acf_engine/init.lua b/lua/entities/acf_engine/init.lua
index 20ded745..fb1f4fe3 100644
--- a/lua/entities/acf_engine/init.lua
+++ b/lua/entities/acf_engine/init.lua
@@ -388,6 +388,8 @@ do -- Spawn and Update functions
 		Entity.DataStore     = Entities.GetArguments("acf_engine")
 		Entity.revLimiterEnabled = true
 
+		duplicator.ClearEntityModifier(Entity, "mass")
+
 		UpdateEngine(Entity, Data, Class, Engine, Type)
 
 		WireLib.TriggerOutput(Entity, "Entity", Entity)
@@ -400,14 +402,6 @@ do -- Spawn and Update functions
 
 		Entity:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
-
 		ACF.CheckLegal(Entity)
 
 		return Entity
diff --git a/lua/entities/acf_fueltank/init.lua b/lua/entities/acf_fueltank/init.lua
index bbf251e5..73382e6c 100644
--- a/lua/entities/acf_fueltank/init.lua
+++ b/lua/entities/acf_fueltank/init.lua
@@ -216,6 +216,8 @@ do -- Spawn and Update functions
 		Tank.LastActivated = 0
 		Tank.DataStore     = Entities.GetArguments("acf_fueltank")
 
+		duplicator.ClearEntityModifier(Entity, "mass")
+
 		UpdateFuelTank(Tank, Data, Class, FuelTank, FuelType)
 
 		WireLib.TriggerOutput(Tank, "Entity", Tank)
@@ -228,14 +230,6 @@ do -- Spawn and Update functions
 
 		Tank:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
-
 		-- Fuel tanks should be active by default
 		Tank:TriggerInput("Active", 1)
 
diff --git a/lua/entities/acf_gearbox/init.lua b/lua/entities/acf_gearbox/init.lua
index 973fe035..85eee595 100644
--- a/lua/entities/acf_gearbox/init.lua
+++ b/lua/entities/acf_gearbox/init.lua
@@ -264,6 +264,8 @@ do -- Spawn and Update functions -----------------------
 		Entity.RClutch        = 1
 		Entity.DataStore      = Entities.GetArguments("acf_gearbox")
 
+		duplicator.ClearEntityModifier(Entity, "mass")
+
 		UpdateGearbox(Entity, Data, Class, Gearbox)
 
 		WireLib.TriggerOutput(Entity, "Entity", Entity)
@@ -276,14 +278,6 @@ do -- Spawn and Update functions -----------------------
 
 		Entity:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
-
 		ACF.CheckLegal(Entity)
 
 		timer.Create("ACF Gearbox Clock " .. Entity:EntIndex(), 3, 0, function()
diff --git a/lua/entities/acf_gun/init.lua b/lua/entities/acf_gun/init.lua
index a3726dd5..9dbaa243 100644
--- a/lua/entities/acf_gun/init.lua
+++ b/lua/entities/acf_gun/init.lua
@@ -251,6 +251,8 @@ do -- Spawn and Update functions --------------------------------
 		Entity.TurretLink	= false
 		Entity.DataStore    = Entities.GetArguments("acf_gun")
 
+		duplicator.ClearEntityModifier(Entity, "mass")
+
 		UpdateWeapon(Entity, Data, Class, Weapon)
 
 		WireLib.TriggerOutput(Entity, "Status", "Empty")
@@ -267,14 +269,6 @@ do -- Spawn and Update functions --------------------------------
 
 		Entity:UpdateOverlay(true)
 
-		do -- Mass entity mod removal
-			local EntMods = Data and Data.EntityMods
-
-			if EntMods and EntMods.mass then
-				EntMods.mass = nil
-			end
-		end
-
 		TimerCreate("ACF Ammo Left " .. Entity:EntIndex(), 1, 0, function()
 			if not IsValid(Entity) then return end