diff --git a/exa/exa_render.c b/exa/exa_render.c
index 380d5f232..16ffcdcf6 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -600,9 +600,12 @@ exaGlyphs (CARD8	op,
     CARD32	component_alpha;
 
     /* If the driver doesn't support accelerated composite, there's no point in
-     * going to this extra work.
+     * going to this extra work.  Assume that no driver will be able to do
+     * component-alpha, which is likely accurate (at least until we make a CA
+     * helper).
      */
-    if (!pExaScr->info->accel.PrepareComposite) {
+    if (!pExaScr->info->accel.PrepareComposite ||
+	(maskFormat && NeedsComponent(maskFormat->format))) {
 	miGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
 	return;
     }
diff --git a/hw/xfree86/exa/exa_render.c b/hw/xfree86/exa/exa_render.c
index 380d5f232..16ffcdcf6 100644
--- a/hw/xfree86/exa/exa_render.c
+++ b/hw/xfree86/exa/exa_render.c
@@ -600,9 +600,12 @@ exaGlyphs (CARD8	op,
     CARD32	component_alpha;
 
     /* If the driver doesn't support accelerated composite, there's no point in
-     * going to this extra work.
+     * going to this extra work.  Assume that no driver will be able to do
+     * component-alpha, which is likely accurate (at least until we make a CA
+     * helper).
      */
-    if (!pExaScr->info->accel.PrepareComposite) {
+    if (!pExaScr->info->accel.PrepareComposite ||
+	(maskFormat && NeedsComponent(maskFormat->format))) {
 	miGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
 	return;
     }
diff --git a/hw/xfree86/exa/exapict.c b/hw/xfree86/exa/exapict.c
index 380d5f232..16ffcdcf6 100644
--- a/hw/xfree86/exa/exapict.c
+++ b/hw/xfree86/exa/exapict.c
@@ -600,9 +600,12 @@ exaGlyphs (CARD8	op,
     CARD32	component_alpha;
 
     /* If the driver doesn't support accelerated composite, there's no point in
-     * going to this extra work.
+     * going to this extra work.  Assume that no driver will be able to do
+     * component-alpha, which is likely accurate (at least until we make a CA
+     * helper).
      */
-    if (!pExaScr->info->accel.PrepareComposite) {
+    if (!pExaScr->info->accel.PrepareComposite ||
+	(maskFormat && NeedsComponent(maskFormat->format))) {
 	miGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
 	return;
     }