diff --git a/include/r_local.h b/include/r_local.h
index b8a2bda25..a306a3a76 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -320,7 +320,7 @@ extern int		r_maxsurfsseen, r_maxedgesseen, r_cnumsurfs;
 extern qboolean	r_surfsonstack;
 extern qboolean	r_dowarpold, r_viewchanged;
 
-extern mleaf_t	*r_viewleaf, *r_oldviewleaf;
+extern mleaf_t	*r_viewleaf;
 
 extern int		r_clipflags;
 extern int		r_dlightframecount;
diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c
index 4917c6289..219c9ad18 100644
--- a/libs/video/renderer/gl/gl_rmain.c
+++ b/libs/video/renderer/gl/gl_rmain.c
@@ -401,7 +401,6 @@ R_SetupFrame (void)
 	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 
 	// current viewleaf
-	r_oldviewleaf = r_viewleaf;
 	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
 
 	V_SetContentsColor (r_viewleaf->contents);
diff --git a/libs/video/renderer/r_bsp.c b/libs/video/renderer/r_bsp.c
index d335faeae..57aa87ce5 100644
--- a/libs/video/renderer/r_bsp.c
+++ b/libs/video/renderer/r_bsp.c
@@ -43,7 +43,8 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
 #include "r_local.h"
 #include "r_shared.h"
 
-mleaf_t    *r_viewleaf, *r_oldviewleaf;
+mleaf_t    *r_viewleaf;
+static mleaf_t *r_oldviewleaf;
 
 void
 R_MarkLeaves (void)
@@ -63,6 +64,8 @@ R_MarkLeaves (void)
 	r_oldviewleaf = r_viewleaf;
 
 	if (r_novis->int_val) {
+		r_oldviewleaf = 0;	// so vis will be recalcualted when novis gets
+							// turned off
 		vis = solid;
 		memset (solid, 0xff, (r_worldentity.model->numleafs + 7) >> 3);
 	} else
diff --git a/libs/video/renderer/sw/sw_rmisc.c b/libs/video/renderer/sw/sw_rmisc.c
index e22a9c6b7..8db884d6a 100644
--- a/libs/video/renderer/sw/sw_rmisc.c
+++ b/libs/video/renderer/sw/sw_rmisc.c
@@ -266,7 +266,6 @@ R_SetupFrame (void)
 	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 
 	// current viewleaf
-	r_oldviewleaf = r_viewleaf;
 	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
 
 	r_dowarpold = r_dowarp;
diff --git a/libs/video/renderer/sw32/sw32_rmisc.c b/libs/video/renderer/sw32/sw32_rmisc.c
index 62dd30318..9dd894293 100644
--- a/libs/video/renderer/sw32/sw32_rmisc.c
+++ b/libs/video/renderer/sw32/sw32_rmisc.c
@@ -262,7 +262,6 @@ R_SetupFrame (void)
 	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 
 	// current viewleaf
-	r_oldviewleaf = r_viewleaf;
 	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
 
 	r_dowarpold = r_dowarp;