diff --git a/src/game/server/gameinterface.cpp b/src/game/server/gameinterface.cpp
index eb99cdf4c3c..128993cda00 100644
--- a/src/game/server/gameinterface.cpp
+++ b/src/game/server/gameinterface.cpp
@@ -2525,7 +2525,7 @@ void CServerGameEnts::CheckTransmit( CCheckTransmitInfo *pInfo, const unsigned s
 		{
 			// FIXME: Hey! Shouldn't this be using SetTransmit so as 
 			// to also force network down dependent entities?
-			while ( true )
+			while ( pEdict )
 			{
 				// mark entity for sending
 				pInfo->m_pTransmitEdict->Set( iEdict );