diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 294a4aedb..14ab738eb 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -870,7 +870,10 @@ glamor_composite_choose_shader(CARD8 op,
             goto fail;
     }
     else {
-        key.source = SHADER_SOURCE_TEXTURE_ALPHA;
+        if (PICT_FORMAT_A(source->format))
+            key.source = SHADER_SOURCE_TEXTURE_ALPHA;
+        else
+            key.source = SHADER_SOURCE_TEXTURE;
     }
 
     if (mask) {