diff --git a/src/game/game/game_draw.c b/src/game/game/game_draw.c
index d4bbb3e037..c48f31bfdc 100644
--- a/src/game/game/game_draw.c
+++ b/src/game/game/game_draw.c
@@ -19,7 +19,7 @@ void Game_DrawScene(bool draw_overlay)
     Camera_Apply();
 
     if (g_Objects[O_LARA].loaded) {
-        Room_DrawAllRooms(g_Camera.interp.result.room_num);
+        Room_DrawAllRooms(g_Camera.interp.room_num);
         if (draw_overlay) {
             Overlay_DrawGameInfo();
         } else {
diff --git a/src/game/interpolation.c b/src/game/interpolation.c
index 76ab48ba24..1c5c13e12d 100644
--- a/src/game/interpolation.c
+++ b/src/game/interpolation.c
@@ -70,11 +70,11 @@ void Interpolation_Commit(void)
         INTERPOLATE(&g_Camera, target.y, ratio, 512);
         INTERPOLATE(&g_Camera, target.z, ratio, 512);
 
-        g_Camera.interp.result.room_num = g_Camera.interp.prev.room_num;
+        g_Camera.interp.room_num = g_Camera.pos.room_number;
         Room_GetFloor(
             g_Camera.interp.result.pos.x,
             g_Camera.interp.result.pos.y + g_Camera.interp.result.shift,
-            g_Camera.interp.result.pos.z, &g_Camera.interp.result.room_num);
+            g_Camera.interp.result.pos.z, &g_Camera.interp.room_num);
     }
 
     INTERPOLATE_ROT(&g_Lara.left_arm, rot.x, ratio, PHD_45);
@@ -146,7 +146,6 @@ void Interpolation_Remember(void)
         REMEMBER(&g_Camera, target.x);
         REMEMBER(&g_Camera, target.y);
         REMEMBER(&g_Camera, target.z);
-        g_Camera.interp.prev.room_num = g_Camera.pos.room_number;
     }
 
     REMEMBER(&g_Lara.left_arm, rot.x);
diff --git a/src/global/types.h b/src/global/types.h
index 35d3a922f9..7edd54ef00 100644
--- a/src/global/types.h
+++ b/src/global/types.h
@@ -1856,8 +1856,8 @@ typedef struct CAMERA_INFO {
             XYZ_32 target;
             XYZ_32 pos;
             int32_t shift;
-            int16_t room_num;
         } result, prev;
+        int16_t room_num;
     } interp;
 } CAMERA_INFO;