diff --git a/src/refresh/r_surf.c b/src/refresh/r_surf.c
index db524e21..3bd548a6 100644
--- a/src/refresh/r_surf.c
+++ b/src/refresh/r_surf.c
@@ -1208,10 +1208,10 @@ R_DrawWorld ( void )
 
 	R_DrawTextureChains();
 	R_BlendLightmaps();
-
 	R_DrawSkyBox();
-
 	R_DrawTriangleOutlines();
+
+	currententity = NULL;
 }
 
 /*