diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 42d70d258..7ace93fc5 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -827,7 +827,8 @@ _e_comp_wl_evas_cb_maximize_pre(void *data, Evas_Object *obj EINA_UNUSED, void *
           ecw = &ec->client.w, ech = &ec->client.h;
         else
           ecw = &ec->w, ech = &ec->h;
-        if ((!e_config->window_maximize_animate) || ec->maximize_anims_disabled)
+        if ((!e_config->window_maximize_animate) ||
+            ec->maximize_anims_disabled || (!ec->comp_data->buffer_commit))
           {
              e_client_maximize_geometry_get(ec, *max, NULL, NULL, &w, &h);
              if (ec->internal)
diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c
index b112df184..351d4872b 100644
--- a/src/modules/wl_desktop_shell/xdg6.c
+++ b/src/modules/wl_desktop_shell/xdg6.c
@@ -530,7 +530,7 @@ _e_xdg_toplevel_cb_maximized_set(struct wl_client *client EINA_UNUSED, struct wl
    if (e_object_is_del(E_OBJECT(ec))) return;
 
    if (ec->lock_user_maximize) return;
-   if (e_config->window_maximize_animate && (!ec->maximize_anims_disabled))
+   if (e_config->window_maximize_animate && (!ec->maximize_anims_disabled) && ec->comp_data->buffer_commit)
      w = ec->w, h = ec->h;
    else
      {