diff --git a/tools/quake3/q3map2/light.cpp b/tools/quake3/q3map2/light.cpp
index 0037a392..3cbf5a77 100644
--- a/tools/quake3/q3map2/light.cpp
+++ b/tools/quake3/q3map2/light.cpp
@@ -1990,6 +1990,16 @@ static void LightWorld( bool fastAllocate, bool bounceStore ){
 
 	/* ydnar: store off lightmaps */
 	StoreSurfaceLightmaps( fastAllocate, true );
+
+	/* ydnar: optional force-to-trisoup */
+	if( trisoup ){
+		for( auto& ds : bspDrawSurfaces ){
+			if( ds.surfaceType == MST_PLANAR ){
+				ds.surfaceType = MST_TRIANGLE_SOUP;
+				ds.lightmapNum[ 0 ] = -3;
+			}
+		}
+	}
 }
 
 
diff --git a/tools/quake3/q3map2/light_ydnar.cpp b/tools/quake3/q3map2/light_ydnar.cpp
index de799ae6..ecb259ef 100644
--- a/tools/quake3/q3map2/light_ydnar.cpp
+++ b/tools/quake3/q3map2/light_ydnar.cpp
@@ -201,12 +201,6 @@ void SmoothNormals(){
 				smoothed[ f ] = true;
 			}
 		}
-
-		/* ydnar: optional force-to-trisoup */
-		if ( trisoup && ds.surfaceType == MST_PLANAR ) {
-			ds.surfaceType = MST_TRIANGLE_SOUP;
-			ds.lightmapNum[ 0 ] = -3;
-		}
 	}
 
 	/* bail if no surfaces have a shade angle */