diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index 8ccf04280..15af516c5 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -537,6 +537,7 @@ Cam_SetView (void)
 	}
 	VectorCopy (cam_viewangles, cl.viewangles);
 	VectorCopy (cl.viewangles, cl.simangles);
+	cl.simangles[ROLL] = 0;						// FIXME @@@
 }
 #endif
 
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 06ffb9852..1fbd55cc6 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -1547,6 +1547,7 @@ CL_ParseServerMessage (void)
 					Sys_MaskPrintf (SYS_DEV, "%f ", cl.simorg[i]);
 				Sys_MaskPrintf (SYS_DEV, "\nintermission simangles: ");
 				MSG_ReadAngleV (net_message, cl.simangles);
+				cl.simangles[ROLL] = 0;						// FIXME @@@
 				for (i = 0; i < 3; i++)
 					Sys_MaskPrintf (SYS_DEV, "%f ", cl.simangles[i]);
 				Sys_MaskPrintf (SYS_DEV, "\n");
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 03c6d0ec7..522315b60 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -130,6 +130,7 @@ CL_PredictMove (void)
 		return;
 
 	VectorCopy (cl.viewangles, cl.simangles);
+	cl.simangles[ROLL] = 0;						// FIXME @@@
 
 	// this is the last frame received from the server
 	from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 674dd5e81..97b85a140 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -697,8 +697,6 @@ DropPunchAngle (void)
 void
 V_RenderView (void)
 {
-	cl.simangles[ROLL] = 0;				// FIXME @@@
-
 	if (cls.state != ca_active)
 		return;