diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 52b72225..ae515d7b 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -470,13 +470,17 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 					self.removeWeaponComponent(weaponName, v2)
 				end
 
+				local weaponHash = joaat(weaponName)
+				
+				RemoveWeaponFromPed(GetPlayerPed(self.source), weaponHash)
+				SetPedAmmo(GetPlayerPed(self.source), weaponHash, 0)
+
 				table.remove(self.loadout, k)
 				break
 			end
 		end
 
 		if weaponLabel then
-			self.triggerEvent('esx:removeWeapon', weaponName)
 			self.triggerEvent('esx:removeInventoryItem', weaponLabel, false, true)
 		end
 	end