diff --git a/composite/compalloc.c b/composite/compalloc.c
index 1a7e4a0da..f555411bf 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -220,6 +220,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
     {
 	DamageRegister (&pWin->drawable, cw->damage);
 	cw->damageRegistered = TRUE;
+	pWin->redirectDraw = RedirectDrawAutomatic;
 	DamageDamageRegion (&pWin->drawable, &pWin->borderSize);
     }
     if (wasMapped && !pWin->mapped)