diff --git a/src/game/server/basecombatweapon.cpp b/src/game/server/basecombatweapon.cpp
index 29d347104..8665fc052 100644
--- a/src/game/server/basecombatweapon.cpp
+++ b/src/game/server/basecombatweapon.cpp
@@ -236,7 +236,7 @@ CBaseEntity* CBaseCombatWeapon::Respawn( void )
 {
 	// make a copy of this weapon that is invisible and inaccessible to players (no touch function). The weapon spawn/respawn code
 	// will decide when to make the weapon visible and touchable.
-	CBaseEntity *pNewWeapon = CBaseEntity::Create( GetClassname(), g_pGameRules->VecWeaponRespawnSpot( this ), GetLocalAngles(), GetOwnerEntity() );
+	CBaseEntity *pNewWeapon = CBaseEntity::Create( GetClassname(), g_pGameRules->VecWeaponRespawnSpot( this ), GetLocalAngles() );
 
 	if ( pNewWeapon )
 	{
diff --git a/src/game/shared/hl2mp/weapon_hl2mpbase.cpp b/src/game/shared/hl2mp/weapon_hl2mpbase.cpp
index 15995a5be..f57427c85 100644
--- a/src/game/shared/hl2mp/weapon_hl2mpbase.cpp
+++ b/src/game/shared/hl2mp/weapon_hl2mpbase.cpp
@@ -195,7 +195,7 @@ void CWeaponHL2MPBase::Materialize( void )
 	}
 
 	SetPickupTouch();
-
+	SetOwnerEntity( NULL );
 	SetThink (NULL);
 }