diff --git a/r_bsp.c b/r_bsp.c
index a9640f22..01229af4 100644
--- a/r_bsp.c
+++ b/r_bsp.c
@@ -663,6 +663,13 @@ void R_DrawSolidClippedSubmodelPolygons (model_t *pmodel, mnode_t *topnode)
 
 	for (i=0 ; i<numsurfaces ; i++, psurf++)
 	{
+		if( FBitSet( psurf->flags, SURF_DRAWTURB ) && !ENGINE_GET_PARM( PARM_QUAKE_COMPATIBLE ))
+		{
+			if( psurf->plane->type != PLANE_Z && !FBitSet( RI.currententity->curstate.effects, EF_WATERSIDES ))
+				continue;
+			if( r_entorigin[2] + pmodel->mins[2] + 1.0 >= psurf->plane->dist )
+				continue;
+		}
 	// find which side of the node we are on
 		pplane = psurf->plane;
 
@@ -738,6 +745,13 @@ void R_DrawSubmodelPolygons (model_t *pmodel, int clipflags, mnode_t *topnode)
 
 	for (i=0 ; i<numsurfaces ; i++, psurf++)
 	{
+		if( FBitSet( psurf->flags, SURF_DRAWTURB ) && !ENGINE_GET_PARM( PARM_QUAKE_COMPATIBLE ))
+		{
+			if( psurf->plane->type != PLANE_Z && !FBitSet( RI.currententity->curstate.effects, EF_WATERSIDES ))
+				continue;
+			if( r_entorigin[2] + pmodel->mins[2] + 1.0 >= psurf->plane->dist )
+				continue;
+		}
 	// find which side of the node we are on
 		pplane = psurf->plane;