diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
index a7fb7192cb5fe..194b0d6a2f8a8 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
@@ -109,9 +109,9 @@ public EtcdMetadataStore(String metadataURL, MetadataStoreConfig conf, boolean e
         try {
             this.client = newEtcdClient(metadataURL, conf);
             this.kv = client.getKVClient();
-            this.client.getWatchClient().watch(ByteSequence.from("\0", StandardCharsets.UTF_8),
+            this.client.getWatchClient().watch(ByteSequence.from("/", StandardCharsets.UTF_8),
                     WatchOption.newBuilder()
-                            .withPrefix(ByteSequence.from("/", StandardCharsets.UTF_8))
+                            .isPrefix(true)
                             .build(), this::handleWatchResponse);
             if (enableSessionWatcher) {
                 this.sessionWatcher =
@@ -285,7 +285,7 @@ protected void batchOperation(List<MetadataOp> ops) {
                                 .withKeysOnly(true)
                                 .withSortField(GetOption.SortTarget.KEY)
                                 .withSortOrder(GetOption.SortOrder.ASCEND)
-                                .withPrefix(prefix)
+                                .isPrefix(true)
                                 .build()));
                         break;
                     }