diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index cb5cb7b96..61b16d6da 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -2045,11 +2045,6 @@ drawscreen(PLAYERp pp)
     // with "last valid" code this should never happen
     // ASSERT(tsectnum >= 0 && tsectnum <= MAXSECTORS);
 
-    pp->six = tx;
-    pp->siy = ty;
-    pp->siz = tz - pp->posz;
-    pp->siang = tq16ang;
-
     if (pp->sop_riding || pp->sop_control)
     {
         tx = pp->posx;
@@ -2058,13 +2053,13 @@ drawscreen(PLAYERp pp)
         tq16ang = pp->q16ang;
         tsectnum = pp->cursectnum;
         updatesectorz(tx, ty, tz, &tsectnum);
-
-        pp->six = tx;
-        pp->siy = ty;
-        pp->siz = tz - pp->posz;
-        pp->siang = tq16ang;
     }
 
+    pp->six = tx;
+    pp->siy = ty;
+    pp->siz = tz - pp->posz;
+    pp->siang = tq16ang;
+
     QuakeViewChange(camerapp, &quake_z, &quake_x, &quake_y, &quake_ang);
     VisViewChange(camerapp, &g_visibility);
     tz = tz + quake_z;