diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index 5d32d9c5e..8a131ff44 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -739,6 +739,11 @@ gl_R_DrawWorld (void)
 	bctx.entity = &r_worldentity;
 
 	R_VisitWorldNodes (&bctx);
+
+	gl_R_CalcLightmaps ();
+
+	gl_R_DrawSkyChain (sky_chain);
+
 	if (r_drawentities->int_val) {
 		for (size_t i = 0; i < r_ent_queue->ent_queues[mod_brush].size; i++) { \
 			entity_t   *ent = r_ent_queue->ent_queues[mod_brush].a[i]; \
@@ -746,10 +751,6 @@ gl_R_DrawWorld (void)
 		}
 	}
 
-	gl_R_CalcLightmaps ();
-
-	gl_R_DrawSkyChain (sky_chain);
-
 	if (!gl_Fog_GetDensity ()
 		|| (gl_fb_bmodels->int_val && gl_mtex_fullbright)
 		|| gl_mtex_active_tmus > 1) {