diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 4a54d85d3..24c7c9e44 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1917,7 +1917,7 @@ _e_comp_wl_subcompositor_cb_subsurface_get(struct wl_client *client EINA_UNUSED,
    if (!ec)
      {
         /* no client exists for this pixmap yet */
-        if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+        if (!(ec = e_client_new(NULL, ep, 0, 0)))
           {
              ERR("Failed to create new client");
              wl_resource_post_no_memory(resource);
diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 5ea062ded..2de403a97 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -567,7 +567,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
    if (!ec)
      {
         /* no client found. not internal window. maybe external client app ? */
-        if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+        if (!(ec = e_client_new(NULL, ep, 0, 0)))
           {
              wl_resource_post_error(surface_resource, 
                                     WL_DISPLAY_ERROR_INVALID_OBJECT, 
@@ -1144,7 +1144,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
    if (!ec)
      {
         /* no client found. not internal window. maybe external client app ? */
-        if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+        if (!(ec = e_client_new(NULL, ep, 0, 0)))
           {
              wl_resource_post_error(surface_resource, 
                                     WL_DISPLAY_ERROR_INVALID_OBJECT, 
@@ -1246,7 +1246,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
    if (!ec)
      {
         /* no client found. create one */
-        if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 1)))
+        if (!(ec = e_client_new(NULL, ep, 0, 1)))
           {
              wl_resource_post_error(surface_resource, 
                                     WL_DISPLAY_ERROR_INVALID_OBJECT,