diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 5a9831c3f..f5490c12e 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -1160,6 +1160,16 @@ static void client_node_resource_destroy(void *data)
 	pw_node_destroy(this->node);
 }
 
+void pw_client_node_registered(struct pw_client_node *this, uint32_t node_id)
+{
+	struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
+
+	pw_client_node_resource_transport(this->resource,
+					  node_id,
+					  impl->other_fds[0],
+					  impl->other_fds[1]);
+}
+
 static void node_initialized(void *data)
 {
 	struct impl *impl = data;
@@ -1167,7 +1177,6 @@ static void node_initialized(void *data)
 	struct pw_node *node = this->node;
 	struct pw_type *t = impl->t;
 	struct pw_global *global;
-	uint32_t node_id;
 	uint32_t area_size, size;
 	struct mem *m;
 
@@ -1200,20 +1209,13 @@ static void node_initialized(void *data)
 	m = ensure_mem(impl, impl->io_areas->fd, t->data.MemFd, impl->io_areas->flags);
 	pw_log_debug("client-node %p: io areas %p", node, impl->io_areas->ptr);
 
-	if ((global = pw_node_get_global(node)) != NULL)
-		node_id = pw_global_get_id(global);
-	else
-		node_id = SPA_ID_INVALID;
-
-	pw_client_node_resource_transport(this->resource,
-					  node_id,
-					  impl->other_fds[0],
-					  impl->other_fds[1]);
-
 	pw_client_node_resource_set_position(this->resource,
 					     m->id,
 					     area_size,
 					     sizeof(struct pw_client_node_position));
+
+	if ((global = pw_node_get_global(node)) != NULL)
+		pw_client_node_registered(this, pw_global_get_id(global));
 }
 
 static void node_free(void *data)
diff --git a/src/modules/module-client-node/client-node.h b/src/modules/module-client-node/client-node.h
index 73ba9e4ea..7a1053bbb 100644
--- a/src/modules/module-client-node/client-node.h
+++ b/src/modules/module-client-node/client-node.h
@@ -47,6 +47,8 @@ pw_client_node_new(struct pw_resource *resource,
 void
 pw_client_node_destroy(struct pw_client_node *node);
 
+void pw_client_node_registered(struct pw_client_node *node, uint32_t node_id);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/modules/module-client-node/client-stream.c b/src/modules/module-client-node/client-stream.c
index 0a23a7f27..8b6632ac1 100644
--- a/src/modules/module-client-node/client-stream.c
+++ b/src/modules/module-client-node/client-stream.c
@@ -938,6 +938,8 @@ static void client_node_initialized(void *data)
 
 	pw_node_register(impl->this.node, NULL, NULL, NULL);
 
+	pw_client_node_registered(impl->client_node, impl->this.node->global->id);
+
 	pw_log_debug("client-stream %p: activating", &impl->this);
 
 	pw_node_set_active(impl->this.node, true);