diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index e3add1f5e..0fc44339c 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -591,6 +591,9 @@ CL_RelinkEntities (void)
 			continue;
 		}
 
+		if (cl_forcelink[i])
+			*old = *new;
+
 		if (cl_forcelink[i] || new->modelindex != old->modelindex) {
 			old->modelindex = new->modelindex;
 			set_entity_model (ent, new->modelindex);
@@ -619,6 +622,9 @@ CL_RelinkEntities (void)
 		if (cl_forcelink[i]) {
 			// The entity was not updated in the last message so move to the
 			// final spot
+			VectorCopy (new->origin, ent->origin);
+			if (!(ent->model->flags & EF_ROTATE))
+				CL_TransformEntity (ent, new->angles, true);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->efrag)
 					r_funcs->R_RemoveEfrags (ent);
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index b6a2f880a..9d2e8dac0 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -553,8 +553,8 @@ CL_ParseUpdate (int bits)
 	else
 		state->angles[2] = baseline->angles[2];
 
-	if (bits & U_STEP)	//FIXME lerping (see fitzquake)
-		forcelink = true;
+//	if (bits & U_STEP)	//FIXME lerping (see fitzquake)
+//		forcelink = true;
 
 	if (cl.protocol == PROTOCOL_FITZQUAKE) {
 		if (bits & U_ALPHA)