diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp
index 42701e66e..dff646c64 100644
--- a/rmw_cyclonedds_cpp/src/rmw_node.cpp
+++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp
@@ -4763,6 +4763,9 @@ extern "C" rmw_client_t * rmw_create_client(
   rmw_client->implementation_identifier = eclipse_cyclonedds_identifier;
   rmw_client->data = info;
   rmw_client->service_name = reinterpret_cast<const char *>(rmw_allocate(strlen(service_name) + 1));
+  std::copy(info->client.id.data, info->client.id.data + sizeof(info->client.id.data),
+      rmw_client->writer_guid);
+
   RET_NULL_X(rmw_client->service_name, goto fail_service_name);
   memcpy(const_cast<char *>(rmw_client->service_name), service_name, strlen(service_name) + 1);