diff --git a/src/events.c b/src/events.c
index bffff20b70eaa919a5829d17c16c729542cef114..77540edd428c6c7c5847b5cb355502ccf5b9b1a4 100644
--- a/src/events.c
+++ b/src/events.c
@@ -873,13 +873,6 @@ handleMapRequest (XMapRequestEvent * ev)
     c = clientGetFromWindow (ev->window, WINDOW);
     if (c)
     {
-        if (CLIENT_FLAG_TEST (c, CLIENT_FLAG_REPARENTING))
-        {
-            TRACE ("handleMapRequest: another request for \"%s\" (0x%lx)", 
-                   c->name, c->window);
-            /* There is already a request in the pipe... */
-            return;
-        }
         TRACE ("handleMapRequest: clientShow");
         clientShow (c, TRUE);
     }
@@ -902,7 +895,7 @@ handleMapNotify (XMapEvent * ev)
     if (c)
     {
         TRACE ("MapNotify for \"%s\" (0x%lx)", c->name, c->window);
-        if (CLIENT_FLAG_REPARENTING)
+        if (CLIENT_FLAG_TEST (c, CLIENT_FLAG_REPARENTING))
         {
             /* First map caused by reparenting, clear flag
                and set ignore_unmaps to 0 so that everything
@@ -911,10 +904,6 @@ handleMapNotify (XMapEvent * ev)
             CLIENT_FLAG_UNSET (c, CLIENT_FLAG_REPARENTING);
             c->ignore_unmap = 0;
         }
-        if (!CLIENT_FLAG_TEST (c, CLIENT_FLAG_HIDDEN))
-        {
-            clientShow (c, TRUE);
-        }
     }
 }