diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h
index d67b4ba3c5..18cac87e13 100644
--- a/src/engine/renderer/tr_local.h
+++ b/src/engine/renderer/tr_local.h
@@ -1489,7 +1489,7 @@ enum
 		surfaceType_t *surface; // any of surface*_t
 		shader_t      *shader;
 		uint64_t      sort;
-		bool          bspSurface;
+		bool          bspSurface; // only for the stationary part of the world, *not* BSP models
 		int fog;
 		int portalNum = -1;
 
diff --git a/src/engine/renderer/tr_world.cpp b/src/engine/renderer/tr_world.cpp
index a8bac11e42..dd2c8db220 100644
--- a/src/engine/renderer/tr_world.cpp
+++ b/src/engine/renderer/tr_world.cpp
@@ -194,7 +194,8 @@ void R_AddBSPModelSurfaces( trRefEntity_t *ent )
 
 	for ( i = 0; i < bspModel->numSurfaces; i++ )
 	{
-		R_AddWorldSurface( bspModel->firstSurface + i, fogNum, -1, FRUSTUM_CLIPALL );
+		bspSurface_t *surf = bspModel->firstSurface + i;
+		R_AddDrawSurf( surf->data, surf->shader, surf->lightmapNum, fogNum );
 	}
 }