diff --git a/irc/handlers.go b/irc/handlers.go
index e7c6f614..d6061b86 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -3211,7 +3211,7 @@ func metadataRegisteredHandler(client *Client, config *Config, subcommand string
 			return
 		}
 
-		batchId := rb.StartNestedBatch("metadata")
+		batchId := rb.StartNestedBatch("metadata", target)
 		defer rb.EndNestedBatch(batchId)
 
 		for _, key := range params[2:] {
@@ -3365,7 +3365,7 @@ func metadataSubsHandler(client *Client, subcommand string, params []string, rb
 }
 
 func playMetadataList(rb *ResponseBuffer, nick, target string, values map[string]string) {
-	batchId := rb.StartNestedBatch("metadata")
+	batchId := rb.StartNestedBatch("metadata", target)
 	defer rb.EndNestedBatch(batchId)
 
 	for key, val := range values {
diff --git a/irc/metadata.go b/irc/metadata.go
index edb4ce1c..713c7eae 100644
--- a/irc/metadata.go
+++ b/irc/metadata.go
@@ -67,7 +67,7 @@ func broadcastMetadataUpdate(server *Server, sessions iter.Seq[*Session], origin
 }
 
 func syncClientMetadata(server *Server, rb *ResponseBuffer, target *Client) {
-	batchId := rb.StartNestedBatch("metadata")
+	batchId := rb.StartNestedBatch("metadata", target.Nick())
 	defer rb.EndNestedBatch(batchId)
 
 	subs := rb.session.MetadataSubscriptions()
@@ -81,7 +81,7 @@ func syncClientMetadata(server *Server, rb *ResponseBuffer, target *Client) {
 }
 
 func syncChannelMetadata(server *Server, rb *ResponseBuffer, channel *Channel) {
-	batchId := rb.StartNestedBatch("metadata")
+	batchId := rb.StartNestedBatch("metadata", channel.Name())
 	defer rb.EndNestedBatch(batchId)
 
 	subs := rb.session.MetadataSubscriptions()