diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 16423c60cac..269b9247c81 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -976,8 +976,8 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 
 		GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 
-		if (glsl || picking) {
-			/* draw glsl */
+		if (glsl || picking || !CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) {
+			/* draw glsl or solid */
 			dm->drawMappedFacesMat(dm,
 			                       tex_mat_set_material_cb,
 			                       set_face_cb, &data);