diff --git a/src/pipewire/node.c b/src/pipewire/node.c
index 9df30cb16..63db03f1f 100644
--- a/src/pipewire/node.c
+++ b/src/pipewire/node.c
@@ -586,7 +586,6 @@ static void node_event(void *data, struct spa_event *event)
 static void node_process(void *data, int status)
 {
 	struct pw_node *node = data;
-	struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
 
 	pw_log_trace("node %p: process driver:%d exported:%d", node, node->driver, node->exported);
 
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 8ffdc4d64..2287eb516 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -851,6 +851,7 @@ struct pw_stream * pw_stream_new(struct pw_remote *remote, const char *name,
 {
 	struct stream *impl;
 	struct pw_stream *this;
+	const char *str;
 
 	impl = calloc(1, sizeof(struct stream));
 	if (impl == NULL)
@@ -867,6 +868,17 @@ struct pw_stream * pw_stream_new(struct pw_remote *remote, const char *name,
 	if (props == NULL)
 		goto no_mem;
 
+	if (!pw_properties_get(props, "node.name")) {
+		const struct pw_properties *p = pw_remote_get_properties(remote);
+
+		if ((str = pw_properties_get(p, "application.name")) != NULL)
+			pw_properties_set(props, "node.name", str);
+		else if ((str = pw_properties_get(p, "application.prgname")) != NULL)
+			pw_properties_set(props, "node.name", str);
+		else
+			pw_properties_set(props, "node.name", name);
+	}
+
 	this->properties = props;
 
 	this->remote = remote;