diff --git a/dlls/prop.cpp b/dlls/prop.cpp
index 62e02cf3..b850f9f6 100644
--- a/dlls/prop.cpp
+++ b/dlls/prop.cpp
@@ -1129,7 +1129,7 @@ int CProp::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, float flD
 {
 	Vector r = (pevInflictor->origin - pev->origin);
 	if ( (!m_attacker
-		  || (pev->velocity.Length() < 700))
+		  || (pev->velocity.Length() < 700)) && ((CBaseEntity*)GET_PRIVATE(ENT(pevAttacker)))
 		 && ((CBaseEntity*)GET_PRIVATE(ENT(pevAttacker)))->IsPlayer())
 		m_attacker.Set(ENT(pevAttacker));
 	DeployThink();