diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 6d4b2674b..b6e468662 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1131,6 +1131,12 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
    state->sy = 0;
    state->new_attach = EINA_FALSE;
 
+   /* insert state frame callbacks into comp_data->frames
+    * NB: This clears state->frames list */
+   ec->comp_data->frames = eina_list_merge(ec->comp_data->frames,
+                                           state->frames);
+   state->frames = NULL;
+
    ec->ignored = ignored;
    if (!ec->comp_data->mapped) goto unmapped;
 
@@ -1201,11 +1207,6 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
         eina_tiler_free(tmp);
      }
 
-   /* insert state frame callbacks into comp_data->frames
-    * NB: This clears state->frames list */
-   ec->comp_data->frames = eina_list_merge(ec->comp_data->frames, state->frames);
-   state->frames = NULL;
-
    return;
 
 unmapped: