diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 0d53b67..d7ec2f0 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -432,6 +432,7 @@ ExaCheckComposite (CARD8      op,
 	exaPrepareAccess (pSrc->pDrawable, EXA_PREPARE_SRC);
     if (pMask && pMask->pDrawable != NULL)
 	exaPrepareAccess (pMask->pDrawable, EXA_PREPARE_MASK);
+    swap(pExaScr, pScreen, CreateGC);
 #ifdef RENDER
     swap(pExaScr, ps, Composite);
     ps->Composite (op,
@@ -448,6 +449,7 @@ ExaCheckComposite (CARD8      op,
                  height);
     swap(pExaScr, ps, Composite);
 #endif /* RENDER */
+    swap(pExaScr, pScreen, CreateGC);
     if (pMask && pMask->pDrawable != NULL)
 	exaFinishAccess (pMask->pDrawable, EXA_PREPARE_MASK);
     if (pSrc->pDrawable != NULL)