diff --git a/ref/soft/r_light.c b/ref/soft/r_light.c
index e026c959..6d5b3f65 100644
--- a/ref/soft/r_light.c
+++ b/ref/soft/r_light.c
@@ -156,8 +156,12 @@ void R_PushDlights( void )
 	tr.dlightframecount = tr.framecount;
 
 	RI.currententity = CL_GetEntityByIndex( 0 );
-	if( RI.currententity )
-		RI.currentmodel = RI.currententity->model;
+
+	// no world -- no dlights
+	if( !RI.currententity )
+		return;
+
+	RI.currentmodel = RI.currententity->model;
 
 	for( i = 0; i < MAX_DLIGHTS; i++, l++ )
 	{
@@ -169,8 +173,7 @@ void R_PushDlights( void )
 		//if( GL_FrustumCullSphere( &RI.frustum, l->origin, l->radius, 15 ))
 			//continue;
 
-		if( RI.currententity )
-			R_MarkLights( l, 1<<i, RI.currentmodel->nodes );
+		R_MarkLights( l, 1<<i, RI.currentmodel->nodes );
 	}
 }