diff --git a/meson.build b/meson.build
index d9587028..29b103aa 100644
--- a/meson.build
+++ b/meson.build
@@ -103,7 +103,7 @@ internal_config = configuration_data()
 
 wayland_project_options = ['tests=false', 'documentation=false']
 wayland_server = dependency('wayland-server',
-	version: '>=1.21',
+	version: '>=1.22',
 	fallback: 'wayland',
 	default_options: wayland_project_options,
 )
diff --git a/types/wlr_subcompositor.c b/types/wlr_subcompositor.c
index 29e7d2af..c18a2335 100644
--- a/types/wlr_subcompositor.c
+++ b/types/wlr_subcompositor.c
@@ -429,7 +429,7 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
 
 	if (wlr_surface_get_root_surface(parent) == surface) {
 		wl_resource_post_error(resource,
-			WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE,
+			WL_SUBCOMPOSITOR_ERROR_BAD_PARENT,
 			"wl_subsurface@%" PRIu32
 			" cannot be a parent of itself or its ancestor", id);
 		return;