diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 8c1777b7..56c0853f 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -560,6 +560,15 @@ static void read_surface_normal_hints(struct wlr_xwm *xwm,
 	memcpy(xsurface->size_hints, &size_hints,
 		sizeof(struct wlr_xwayland_surface_size_hints));
 
+	if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) == 0) {
+		xsurface->size_hints->min_width = -1;
+		xsurface->size_hints->min_height = -1;
+	}
+	if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE) == 0) {
+		xsurface->size_hints->max_width = -1;
+		xsurface->size_hints->max_height = -1;
+	}
+
 	wlr_log(WLR_DEBUG, "WM_NORMAL_HINTS (%d)", reply->value_len);
 }
 #else