diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 1b6ccc841..f3826c3cd 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -451,7 +451,7 @@ xwl_shutdown(void)
    if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
 
    free(exs);
-   e_comp_x_shutdown();
+   if (e_comp_util_has_x()) e_comp_x_shutdown();
    ecore_x_shutdown();
    e_util_env_set("DISPLAY", NULL);
 }