diff --git a/src/game/server/entitylist.cpp b/src/game/server/entitylist.cpp
index 13051f721..33e595a32 100644
--- a/src/game/server/entitylist.cpp
+++ b/src/game/server/entitylist.cpp
@@ -599,6 +599,9 @@ CBaseEntity *CGlobalEntityList::FindEntityByClassname( CBaseEntity *pStartEntity
 			continue;
 		}
 
+		if ( pEntity->IsMarkedForDeletion() )
+			continue;
+
 		if ( pEntity->ClassMatches(szName) )
 			return pEntity;
 	}
@@ -727,6 +730,9 @@ CBaseEntity *CGlobalEntityList::FindEntityByName( CBaseEntity *pStartEntity, con
 			continue;
 		}
 
+		if ( ent->IsMarkedForDeletion() )
+			continue;
+
 		if ( !ent->m_iName.Get() )
 			continue;
 
@@ -788,6 +794,9 @@ CBaseEntity *CGlobalEntityList::FindEntityByModel( CBaseEntity *pStartEntity, co
 			continue;
 		}
 
+		if ( ent->IsMarkedForDeletion() )
+			continue;
+
 		if ( !ent->edict() || !ent->GetModelName() )
 			continue;
 
@@ -818,6 +827,9 @@ CBaseEntity	*CGlobalEntityList::FindEntityByTarget( CBaseEntity *pStartEntity, c
 			continue;
 		}
 
+		if ( ent->IsMarkedForDeletion() )
+			continue;
+
 		if ( !ent->m_target )
 			continue;
 
@@ -890,6 +902,9 @@ CBaseEntity *CGlobalEntityList::FindEntityInSphere( CBaseEntity *pStartEntity, c
 			continue;
 		}
 
+		if ( ent->IsMarkedForDeletion() )
+			continue;
+
 		if ( !ent->edict() )
 			continue;