diff --git a/src/modules/wl_desktop_shell/xdg5.c b/src/modules/wl_desktop_shell/xdg5.c
index 6db889e72..7295f16d8 100644
--- a/src/modules/wl_desktop_shell/xdg5.c
+++ b/src/modules/wl_desktop_shell/xdg5.c
@@ -881,10 +881,7 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t
 static void
 _xdg5_client_hook_del(void *d EINA_UNUSED, E_Client *ec)
 {
-   E_Shell_Data *shd;
-
-   if (!ec->comp_data) return;
-   shd = ec->comp_data->shell.data;
+   E_Shell_Data *shd = ec->comp_data->shell.data;
 
    if (shd && (shd->version != 5)) return;
    if (ec->comp_data->shell.surface)
diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c
index dc4b763ce..d98bfc905 100644
--- a/src/modules/wl_desktop_shell/xdg6.c
+++ b/src/modules/wl_desktop_shell/xdg6.c
@@ -1325,7 +1325,6 @@ _xdg6_client_destroy(E_Client *ec)
 {
    E_Shell_Data *shd;
 
-   if (!ec->comp_data) return;
    shd = ec->comp_data->shell.data;
    if (shd && (shd->version != 6)) return;
    if (ec->comp_data->shell.surface)