diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index 34571ef3c4..be4f2ea41c 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -33,6 +33,7 @@ public class CommandLatencyId implements Serializable, Comparable<CommandLatency
     private final SocketAddress localAddress;
     private final SocketAddress remoteAddress;
     private final ProtocolKeyword commandType;
+    private final String commandName;
 
     protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddress, ProtocolKeyword commandType) {
         LettuceAssert.notNull(localAddress, "LocalAddress must not be null");
@@ -42,6 +43,7 @@ protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddre
         this.localAddress = localAddress;
         this.remoteAddress = remoteAddress;
         this.commandType = commandType;
+        this.commandName = commandType.name();
     }
 
     /**
@@ -96,14 +98,14 @@ public boolean equals(Object o) {
             return false;
         if (!remoteAddress.equals(that.remoteAddress))
             return false;
-        return commandType.equals(that.commandType);
+        return commandName.equals(that.commandName);
     }
 
     @Override
     public int hashCode() {
         int result = localAddress.hashCode();
         result = 31 * result + remoteAddress.hashCode();
-        result = 31 * result + commandType.hashCode();
+        result = 31 * result + commandName.hashCode();
         return result;
     }
 
@@ -124,7 +126,7 @@ public int compareTo(CommandLatencyId o) {
             return localResult;
         }
 
-        return commandType.toString().compareTo(o.commandType.toString());
+        return commandName.compareTo(o.commandName);
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
index 39b29507f2..d6305a7fe7 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
@@ -20,9 +20,12 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.netty.channel.local.LocalAddress;
 
 /**
+ * Unit tests for {@link CommandLatencyId}.
+ *
  * @author Mark Paluch
  */
 class CommandLatencyIdUnitTests {
@@ -39,4 +42,35 @@ void testValues() {
         assertThat(sut.localAddress()).isEqualTo(LocalAddress.ANY);
         assertThat(sut.remoteAddress()).isEqualTo(new LocalAddress("me"));
     }
+
+    @Test
+    void testEquality() {
+        assertThat(sut).isEqualTo(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("ADDR")));
+        assertThat(sut).isNotEqualTo(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("FOO")));
+    }
+
+    @Test
+    void testHashCode() {
+        assertThat(sut)
+                .hasSameHashCodeAs(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("ADDR")));
+    }
+
+    static class MyCommand implements ProtocolKeyword {
+
+        final String name;
+
+        public MyCommand(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return name.getBytes();
+        }
+
+        @Override
+        public String name() {
+            return name;
+        }
+    }
 }