diff --git a/src/daemon/entrance_xserver.c b/src/daemon/entrance_xserver.c
index d1d1c96..bab3d5c 100644
--- a/src/daemon/entrance_xserver.c
+++ b/src/daemon/entrance_xserver.c
@@ -133,6 +133,7 @@ entrance_xserver_end(void)
      kill(atoi(xpid), SIGTERM);
 
    unsetenv("ENTRANCE_XPID");
+   while (waitpid(-1, NULL, WNOHANG) > 0);
 }
 
 void