diff --git a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java
index 8c03e64f18..392f4c1a31 100644
--- a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java
+++ b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java
@@ -172,9 +172,7 @@ final class XdsServerWrapper extends Server {
 
   private void internalStart() {
     try {
-      // TODO(dnvindhya): Add "#server" as "grpc.target" attribute value for
-      // xDS enabled servers.
-      xdsClientPool = xdsClientPoolFactory.getOrCreate("", new MetricRecorder() {});
+      xdsClientPool = xdsClientPoolFactory.getOrCreate("#server", new MetricRecorder() {});
     } catch (Exception e) {
       StatusException statusException = Status.UNAVAILABLE.withDescription(
               "Failed to initialize xDS").withCause(e).asException();