diff --git a/src/wayland/meta-wayland-legacy-xdg-shell.c b/src/wayland/meta-wayland-legacy-xdg-shell.c
index 504b34ffd..1523481d4 100644
--- a/src/wayland/meta-wayland-legacy-xdg-shell.c
+++ b/src/wayland/meta-wayland-legacy-xdg-shell.c
@@ -397,6 +397,9 @@ zxdg_toplevel_v6_set_maximized (struct wl_client   *client,
   if (!window)
     return;
 
+  if (!window->has_maximize_func)
+    return;
+
   meta_window_force_placement (window, TRUE);
   meta_window_maximize (window, META_MAXIMIZE_BOTH);
 }
diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
index c7e738357..afd4bb94b 100644
--- a/src/wayland/meta-wayland-xdg-shell.c
+++ b/src/wayland/meta-wayland-xdg-shell.c
@@ -393,6 +393,9 @@ xdg_toplevel_set_maximized (struct wl_client   *client,
   if (!window)
     return;
 
+  if (!window->has_maximize_func)
+    return;
+
   meta_window_force_placement (window, TRUE);
   meta_window_maximize (window, META_MAXIMIZE_BOTH);
 }