diff --git a/engine/gl/gl_warp.c b/engine/gl/gl_warp.c
index 99cd91b27..c30f96d0e 100644
--- a/engine/gl/gl_warp.c
+++ b/engine/gl/gl_warp.c
@@ -291,6 +291,7 @@ qboolean R_DrawSkyroom(shader_t *skyshader)
 {
 	float vmat[16];
 	refdef_t oldrefdef;
+	int oldarea = r_viewarea, oldcluster[2] = {r_viewcluster,r_viewcluster2};
 //	extern cvar_t r_ignoreentpvs; //legacy value is 1...
 
 	if (r_viewcluster == -1)
@@ -353,6 +354,9 @@ qboolean R_DrawSkyroom(shader_t *skyshader)
 	Surf_SetupFrame();
 	Surf_DrawWorld ();
 
+	r_viewarea = oldarea;
+	r_viewcluster = oldcluster[0];
+	r_viewcluster2 = oldcluster[1];
 	r_refdef = oldrefdef;
 
 	/*broken stuff*/