diff --git a/metadata/src/main/java/org/apache/kafka/controller/ControllerMetricsManager.java b/metadata/src/main/java/org/apache/kafka/controller/ControllerMetricsManager.java
index cf16a91483..50587972d5 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/ControllerMetricsManager.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/ControllerMetricsManager.java
@@ -288,7 +288,7 @@ private void replay(PartitionChangeRecord record) {
 
     private void replay(RemoveTopicRecord record) {
         Uuid topicId = record.topicId();
-        Predicate<TopicIdPartition> matchesTopic = tp -> tp.topicId() == topicId;
+        Predicate<TopicIdPartition> matchesTopic = tp -> tp.topicId().equals(topicId);
 
         topicCount--;
         topicPartitions.keySet().removeIf(matchesTopic);