diff --git a/dix/window.c b/dix/window.c
index 5e8338f2f..d750b3baa 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3079,11 +3079,11 @@ void
 SendVisibilityNotify(WindowPtr pWin)
 {
     xEvent event;
-    if (!MapUnmapEventsEnabled(pWin))
-        return;
 #ifndef NO_XINERAMA_PORT
     unsigned int visibility = pWin->visibility;
 #endif
+    if (!MapUnmapEventsEnabled(pWin))
+        return;
 #ifdef PANORAMIX
     /* This is not quite correct yet, but it's close */
     if(!noPanoramiXExtension) {