diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c
index 748992dd8..1861e5504 100644
--- a/src/gst/gstpipewiresink.c
+++ b/src/gst/gstpipewiresink.c
@@ -659,11 +659,13 @@ gst_pipewire_sink_start (GstBaseSink * basesink)
 
   pwsink->negotiated = FALSE;
 
+  props = pw_properties_new (NULL, NULL);
+  if (pwsink->client_name) {
+    pw_properties_set (props, PW_KEY_NODE_NAME, pwsink->client_name);
+    pw_properties_set (props, PW_KEY_NODE_DESCRIPTION, pwsink->client_name);
+  }
   if (pwsink->properties) {
-    props = pw_properties_new (NULL, NULL);
     gst_structure_foreach (pwsink->properties, copy_properties, props);
-  } else {
-    props = NULL;
   }
 
   pw_thread_loop_lock (pwsink->core->loop);
diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index d439d9e0d..65aba4021 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -1077,11 +1077,13 @@ gst_pipewire_src_open (GstPipeWireSrc * pwsrc)
 
   pw_thread_loop_lock (pwsrc->core->loop);
 
+  props = pw_properties_new (NULL, NULL);
+  if (pwsrc->client_name) {
+    pw_properties_set (props, PW_KEY_NODE_NAME, pwsrc->client_name);
+    pw_properties_set (props, PW_KEY_NODE_DESCRIPTION, pwsrc->client_name);
+  }
   if (pwsrc->properties) {
-    props = pw_properties_new (NULL, NULL);
     gst_structure_foreach (pwsrc->properties, copy_properties, props);
-  } else {
-    props = NULL;
   }
 
   if ((pwsrc->stream = pw_stream_new (pwsrc->core->core,