diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index eb891f866..74b3491b8 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -474,6 +474,7 @@ _e_client_free(E_Client *ec)
 
    e_hints_client_list_set();
    evas_object_del(ec->frame);
+   E_FREE(ec->comp_data);
    free(ec);
 }
 
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index dc904570e..6f6b9799c 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4178,7 +4178,6 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
         ec->parent->modal = NULL;
      }
    E_FREE_FUNC(ec->comp_data->first_draw_delay, ecore_timer_del);
-   E_FREE(ec->comp_data);
    if (post_clients)
      post_clients = eina_list_remove(post_clients, ec);