diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index 70a25ced..1ade59cd 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -1291,6 +1291,12 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
 
 	GLimp_LogComment("--- RB_SurfaceVaoMdvMesh ---\n");
 
+	if (ShaderRequiresCPUDeforms(tess.shader))
+	{
+		RB_SurfaceMesh(surface->mdvSurface);
+		return;
+	}
+
 	if(!surface->vao)
 		return;