diff --git a/extensions/tf2/extension.cpp b/extensions/tf2/extension.cpp
index 71f5279f..76e6c234 100644
--- a/extensions/tf2/extension.cpp
+++ b/extensions/tf2/extension.cpp
@@ -414,7 +414,7 @@ int FindEntityByNetClass(int start, const char *classname)
 	for (int i = ((start != -1) ? start : 0); i < gpGlobals->maxEntities; i++)
 	{
 		current = engine->PEntityOfEntIndex(i);
-		if (current == NULL)
+		if (current == NULL || current->IsFree())
 		{
 			continue;
 		}