diff --git a/dix/window.c b/dix/window.c
index de6d617ce..c68e8a8ad 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2916,7 +2916,7 @@ UnmapSubwindows(WindowPtr pWin)
                 UnrealizeTree(pChild, FALSE);
         }
     }
-    if (wasViewable && anyMarked) {
+    if (wasViewable && anyMarked && pLayerWin) {
         if (pLayerWin->parent == pWin)
             (*pScreen->MarkWindow) (pWin);
         else {