diff --git a/irc/handlers.go b/irc/handlers.go
index 484c7c66..4173525f 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -3295,7 +3295,7 @@ func metadataRegisteredHandler(client *Client, config *Config, subcommand string
 
 		values := targetObj.ClearMetadata()
 
-		playMetadataList(rb, client.Nick(), target, values)
+		playMetadataClear(rb, client.Nick(), target, values)
 
 	case "get":
 		if !metadataCanISeeThisTarget(client, targetObj) {
diff --git a/irc/metadata.go b/irc/metadata.go
index 737bf705..9e64e961 100644
--- a/irc/metadata.go
+++ b/irc/metadata.go
@@ -116,6 +116,15 @@ func playMetadataList(rb *ResponseBuffer, nick, target string, values map[string
 	}
 }
 
+func playMetadataClear(rb *ResponseBuffer, nick, target string, values map[string]string) {
+	batchId := rb.StartNestedBatch(nil, "metadata", target)
+	defer rb.EndNestedBatch(batchId)
+
+	for key := range values {
+		rb.Add(nil, rb.session.client.server.name, RPL_KEYNOTSET, nick, target, key, rb.session.client.t("Metadata value cleared"))
+	}
+}
+
 func playMetadataVerbBatch(rb *ResponseBuffer, target string, values map[string]string) {
 	batchId := rb.StartNestedBatch(nil, "metadata", target)
 	defer rb.EndNestedBatch(batchId)