diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c
index 5e8d616c..55bb14c0 100644
--- a/engine/client/cl_game.c
+++ b/engine/client/cl_game.c
@@ -2417,12 +2417,15 @@ pfnIndexFromTrace
 */
 int GAME_EXPORT pfnIndexFromTrace( struct pmtrace_s *pTrace )
 {
+#if 0 // Velaron: breaks compatibility with mods that call the function after CL_PopPMStates
 	if( pTrace->ent >= 0 && pTrace->ent < clgame.pmove->numphysent )
 	{
 		// return cl.entities number
 		return clgame.pmove->physents[pTrace->ent].info;
 	}
 	return -1;
+#endif
+	return clgame.pmove->physents[pTrace->ent].info;
 }
 
 /*