diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index f3826c3cd..7848595b3 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -451,8 +451,11 @@ xwl_shutdown(void)
    if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
 
    free(exs);
-   if (e_comp_util_has_x()) e_comp_x_shutdown();
-   ecore_x_shutdown();
+   if (!stopping)
+     {
+        if (e_comp_util_has_x()) e_comp_x_shutdown();
+        ecore_x_shutdown();
+     }
    e_util_env_set("DISPLAY", NULL);
 }