diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index ea9f0cb1a7..9f0f5aeb56 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -106,9 +106,8 @@ ephyrPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
     tmpval[0].val = alu;
     tmpval[1].val = pm;
     tmpval[2].val = fg;
-    ChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground,
-             tmpval);
 
+    ChangeGC(NULL, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, tmpval);
     ValidateGC(&pPix->drawable, fakexa->pGC);
 
     TRACE_DRAW();
@@ -175,8 +174,8 @@ ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu,
 
     tmpval[0].val = alu;
     tmpval[1].val = pm;
-    ChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask, tmpval);
 
+    ChangeGC(NULL, fakexa->pGC, GCFunction | GCPlaneMask, tmpval);
     ValidateGC(&pDst->drawable, fakexa->pGC);
 
     TRACE_DRAW();