diff --git a/shared/rd-rend2/tr_main.cpp b/shared/rd-rend2/tr_main.cpp
index 81f70776ed..c46011b88d 100644
--- a/shared/rd-rend2/tr_main.cpp
+++ b/shared/rd-rend2/tr_main.cpp
@@ -2565,7 +2565,7 @@ void R_SetupViewParms(const trRefdef_t *refdef)
 	R_RotateForViewer(&tr.viewParms.world, &tr.viewParms);
 	R_SetupProjection(&tr.viewParms, tr.viewParms.zNear, tr.viewParms.zFar, qtrue);
 
-	if (tr.world)
+	if (tr.world && !(refdef->rdflags & RDF_NOWORLDMODEL))
 	{
 		R_MarkLeaves();
 
@@ -2694,7 +2694,9 @@ void R_GatherFrameViews(trRefdef_t *refdef)
 {
 	int mainFlags = 0;
 	// skyportal view
-	if (tr.world && tr.world->skyboxportal)
+	if (tr.world &&
+		tr.world->skyboxportal &&
+		!(refdef->rdflags & RDF_NOWORLDMODEL))
 	{
 		tr.viewCount++;
 		tr.viewParms = tr.skyPortalParms;
@@ -2719,7 +2721,7 @@ void R_GatherFrameViews(trRefdef_t *refdef)
 	}
 
 	VectorCopy(refdef->vieworg, tr.viewParms.pvsOrigin);
-	if (tr.world)
+	if (tr.world && !(refdef->rdflags & RDF_NOWORLDMODEL))
 		R_MarkLeaves();
 
 	if (!(refdef->rdflags & RDF_NOWORLDMODEL))