diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c
index aa7b3efd..ffcea5a5 100644
--- a/Quake/cl_parse.c
+++ b/Quake/cl_parse.c
@@ -733,11 +733,6 @@ void CL_ParseClientdata (void)
 	{
 		cl.stats[STAT_WEAPON] = i;
 		Sbar_Changed ();
-
-		//johnfitz -- lerping
-		if (cl.viewent.model != cl.model_precache[cl.stats[STAT_WEAPON]])
-			cl.viewent.lerpflags |= LERP_RESETANIM; //don't lerp animation across model changes
-		//johnfitz
 	}
 
 	i = MSG_ReadShort ();
@@ -805,6 +800,14 @@ void CL_ParseClientdata (void)
 	else
 		cl.viewent.alpha = ENTALPHA_DEFAULT;
 	//johnfitz
+    
+	//johnfitz -- lerping
+	//ericw -- this was done before the upper 8 bits of cl.stats[STAT_WEAPON] were filled in, breaking on large maps like zendar.bsp
+	if (cl.viewent.model != cl.model_precache[cl.stats[STAT_WEAPON]])
+	{
+		cl.viewent.lerpflags |= LERP_RESETANIM; //don't lerp animation across model changes
+	}
+	//johnfitz
 }
 
 /*