diff --git a/src/modules/module-metadata/metadata.c b/src/modules/module-metadata/metadata.c
index 1d9bb4844..87b0da7a4 100644
--- a/src/modules/module-metadata/metadata.c
+++ b/src/modules/module-metadata/metadata.c
@@ -33,6 +33,7 @@ struct impl {
 	struct pw_metadata *metadata;
 	struct pw_resource *resource;
 	struct spa_hook resource_listener;
+	int pending;
 };
 
 struct resource_data {
@@ -42,35 +43,8 @@ struct resource_data {
 	struct spa_hook resource_listener;
 	struct spa_hook object_listener;
 	struct spa_hook metadata_listener;
-};
-
-static int metadata_set_property(void *object,
-			uint32_t subject,
-			const char *key,
-			const char *type,
-			const char *value)
-{
-        struct resource_data *d = object;
-	struct impl *impl = d->impl;
-	pw_log_debug("%p", impl->metadata);
-	pw_metadata_set_property(impl->metadata, subject, key, type, value);
-	return 0;
-}
-
-
-static int metadata_clear(void *object)
-{
-        struct resource_data *d = object;
-	struct impl *impl = d->impl;
-	pw_log_debug("%p", impl->metadata);
-	pw_metadata_clear(impl->metadata);
-	return 0;
-}
-
-static const struct pw_metadata_methods metadata_methods = {
-	PW_VERSION_METADATA_METHODS,
-	.set_property = metadata_set_property,
-	.clear = metadata_clear,
+	struct spa_hook impl_resource_listener;
+	int pong_seq;
 };
 
 #define pw_metadata_resource(r,m,v,...)      \
@@ -85,9 +59,10 @@ static int metadata_property(void *object,
 			const char *type,
 			const char *value)
 {
-        struct resource_data *d = object;
-	pw_log_debug("%p", d->resource);
-	pw_metadata_resource_property(d->resource, subject, key, type, value);
+	struct resource_data *d = object;
+	struct impl *impl = d->impl;
+	if (impl->pending == 0 || d->pong_seq != 0)
+		pw_metadata_resource_property(d->resource, subject, key, type, value);
 	return 0;
 }
 
@@ -96,11 +71,40 @@ static const struct pw_metadata_events metadata_events = {
 	.property = metadata_property,
 };
 
+static int metadata_set_property(void *object,
+			uint32_t subject,
+			const char *key,
+			const char *type,
+			const char *value)
+{
+	struct resource_data *d = object;
+	struct impl *impl = d->impl;
+	pw_metadata_set_property(impl->metadata, subject, key, type, value);
+	return 0;
+}
+
+static int metadata_clear(void *object)
+{
+	struct resource_data *d = object;
+	struct impl *impl = d->impl;
+	pw_metadata_clear(impl->metadata);
+	return 0;
+}
+
+static const struct pw_metadata_methods metadata_methods = {
+	PW_VERSION_METADATA_METHODS,
+	.set_property = metadata_set_property,
+	.clear = metadata_clear,
+};
+
+
 static void global_unbind(void *data)
 {
-        struct resource_data *d = data;
-	if (d->resource)
+	struct resource_data *d = data;
+	if (d->resource) {
 	        spa_hook_remove(&d->metadata_listener);
+	        spa_hook_remove(&d->impl_resource_listener);
+	}
 }
 
 static const struct pw_resource_events resource_events = {
@@ -108,6 +112,22 @@ static const struct pw_resource_events resource_events = {
 	.destroy = global_unbind,
 };
 
+static void impl_resource_pong(void *data, int seq)
+{
+	struct resource_data *d = data;
+
+	if (d->pong_seq == seq) {
+		pw_impl_client_set_busy(pw_resource_get_client(d->resource), false);
+		d->pong_seq = 0;
+		d->impl->pending--;
+	}
+}
+
+static const struct pw_resource_events impl_resource_events = {
+	PW_VERSION_RESOURCE_EVENTS,
+	.pong = impl_resource_pong,
+};
+
 static int
 global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
             uint32_t version, uint32_t id)
@@ -135,11 +155,21 @@ global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
 	pw_resource_add_object_listener(resource,
 			&data->object_listener,
                         &metadata_methods, data);
+
+	pw_impl_client_set_busy(client, true);
+
 	/* implementation events -> resource */
 	pw_metadata_add_listener(impl->metadata,
 			&data->metadata_listener,
 			&metadata_events, data);
 
+	pw_resource_add_listener(impl->resource,
+			&data->impl_resource_listener,
+                        &impl_resource_events, data);
+
+	data->pong_seq = pw_resource_ping(impl->resource, data->pong_seq);
+	impl->pending++;
+
 	return 0;
 }
 
diff --git a/src/modules/module-metadata/protocol-native.c b/src/modules/module-metadata/protocol-native.c
index fc7740eff..bde3d3e4d 100644
--- a/src/modules/module-metadata/protocol-native.c
+++ b/src/modules/module-metadata/protocol-native.c
@@ -39,8 +39,12 @@ static int metadata_resource_marshal_add_listener(void *object,
 			void *data)
 {
 	struct pw_resource *resource = object;
+	struct spa_pod_builder *b;
+
 	pw_resource_add_object_listener(resource, listener, events, data);
-	return 0;
+
+	b = pw_protocol_native_begin_resource(resource, PW_METADATA_METHOD_ADD_LISTENER, NULL);
+	return pw_protocol_native_end_resource(resource, b);
 }
 
 static int metadata_proxy_marshal_add_listener(void *object,
@@ -53,12 +57,29 @@ static int metadata_proxy_marshal_add_listener(void *object,
 	return 0;
 }
 
-static int metadata_demarshal_add_listener(void *object,
+static int metadata_resource_demarshal_add_listener(void *object,
 			const struct pw_protocol_native_message *msg)
 {
 	return -ENOTSUP;
 }
 
+static const struct pw_metadata_events pw_protocol_native_metadata_client_event_marshal;
+
+static int metadata_proxy_demarshal_add_listener(void *object,
+			const struct pw_protocol_native_message *msg)
+{
+	struct pw_proxy *proxy = object;
+	struct spa_hook listener;
+	int res;
+
+	spa_zero(listener);
+	res = pw_proxy_notify(proxy, struct pw_metadata_methods, add_listener, 0,
+			&listener, &pw_protocol_native_metadata_client_event_marshal, object);
+	spa_hook_remove(&listener);
+
+	return res;
+}
+
 static void metadata_marshal_set_property(struct spa_pod_builder *b, uint32_t subject,
 		const char *key, const char *type, const char *value)
 {
@@ -187,7 +208,6 @@ static int metadata_proxy_marshal_property(void *object, uint32_t subject,
 {
 	struct pw_proxy *proxy = object;
 	struct spa_pod_builder *b;
-	pw_log_debug(".");
 	b = pw_protocol_native_begin_proxy(proxy, PW_METADATA_EVENT_PROPERTY, NULL);
 	metadata_marshal_property(b, subject, key, type, value);
 	return pw_protocol_native_end_proxy(proxy, b);
@@ -198,7 +218,6 @@ static int metadata_resource_marshal_property(void *object, uint32_t subject,
 {
 	struct pw_resource *resource = object;
 	struct spa_pod_builder *b;
-	pw_log_debug(".");
 	b = pw_protocol_native_begin_resource(resource, PW_METADATA_EVENT_PROPERTY, NULL);
 	metadata_marshal_property(b, subject, key, type, value);
 	return pw_protocol_native_end_resource(resource, b);
@@ -262,7 +281,7 @@ static const struct pw_metadata_methods pw_protocol_native_metadata_server_metho
 static const struct pw_protocol_native_demarshal
 pw_protocol_native_metadata_client_method_demarshal[PW_METADATA_METHOD_NUM] =
 {
-	[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_demarshal_add_listener, 0 },
+	[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_proxy_demarshal_add_listener, 0 },
 	[PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_proxy_demarshal_set_property, 0 },
 	[PW_METADATA_METHOD_CLEAR] = { &metadata_proxy_demarshal_clear, 0 },
 };
@@ -270,7 +289,7 @@ pw_protocol_native_metadata_client_method_demarshal[PW_METADATA_METHOD_NUM] =
 static const struct pw_protocol_native_demarshal
 pw_protocol_native_metadata_server_method_demarshal[PW_METADATA_METHOD_NUM] =
 {
-	[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_demarshal_add_listener, 0 },
+	[PW_METADATA_METHOD_ADD_LISTENER] = { &metadata_resource_demarshal_add_listener, 0 },
 	[PW_METADATA_METHOD_SET_PROPERTY] = { &metadata_resource_demarshal_set_property, 0 },
 	[PW_METADATA_METHOD_CLEAR] = { &metadata_resource_demarshal_clear, 0 },
 };