diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 0f601c4178f..287bc0454e9 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -373,7 +373,7 @@ grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr,
     // allocated host's ownership is passed to ListenSocketNode.
     state->channelz_listen_socket =
         grpc_core::MakeRefCounted<grpc_core::channelz::ListenSocketNode>(
-            host, *port_num);
+            grpc_core::UniquePtr<char>(host), *port_num);
     gpr_free(port);
     socket_uuid = state->channelz_listen_socket->uuid();
   }
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc
index 4a32b1f39ab..032654b8617 100644
--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@@ -374,10 +374,8 @@ grpc_json* SocketNode::RenderJson() {
   return top_level_json;
 }
 
-ListenSocketNode::ListenSocketNode(char* host, int port)
-    : BaseNode(EntityType::kSocket),
-      host_(UniquePtr<char>(host)),
-      port_(port) {}
+ListenSocketNode::ListenSocketNode(UniquePtr<char> host, int port)
+    : BaseNode(EntityType::kSocket), host_(std::move(host)), port_(port) {}
 
 grpc_json* ListenSocketNode::RenderJson() {
   // We need to track these three json objects to build our object
diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h
index 2c6fd01006a..8e666231421 100644
--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@@ -269,7 +269,7 @@ class SocketNode : public BaseNode {
 class ListenSocketNode : public BaseNode {
  public:
   // ListenSocketNode takes ownership of host.
-  ListenSocketNode(char* host, int port);
+  ListenSocketNode(UniquePtr<char> host, int port);
   ~ListenSocketNode() override {}
 
   grpc_json* RenderJson() override;