diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 3e5c895f0..b43e3113e 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -448,6 +448,11 @@ E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "XWayland" };
 E_API void *
 e_modapi_init(E_Module *m)
 {
+   struct sigaction sa;
+
+   sigaction(SIGCHLD, NULL, &sa);
+   sa.sa_flags |= SA_NOCLDWAIT;
+   sigaction(SIGCHLD, &sa, NULL);
    return xwl_init(m);
 }