diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index 42300612..81a01a0e 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -1081,7 +1081,7 @@ void RemoveWeapon(any data)
 {
 	if(IsValidEntity(data))
 	{
-		RemoveEntity(data);
+		AcceptEntityInput(data, "Kill");
 	}
 }
 
@@ -1164,7 +1164,7 @@ public void OnWeaponDrop(int client, int entity)
 {
 	if(gB_NoWeaponDrops && IsValidEntity(entity))
 	{
-		RemoveEntity(entity);
+		AcceptEntityInput(entity, "Kill");
 	}
 }