diff --git a/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt b/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt
index 5a0c17011bf..5611339791e 100644
--- a/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt
+++ b/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt
@@ -102,9 +102,9 @@ class ClientMetricsInterceptor private constructor(
       GrpcStatus.OK.code -> HTTP_OK
       GrpcStatus.CANCELLED.code -> HTTP_CLIENT_CLOSED_REQUEST
       GrpcStatus.UNKNOWN.code,
-      GrpcStatus.INTERNAL.code,
       GrpcStatus.DATA_LOSS.code -> HTTP_INTERNAL_SERVER_ERROR
 
+      GrpcStatus.INTERNAL.code,  // This aligns with the mapping in ExceptionHandler and https://grpc.github.io/grpc/core/md_doc_http-grpc-status-mapping.html
       GrpcStatus.INVALID_ARGUMENT.code,
       GrpcStatus.FAILED_PRECONDITION.code,
       GrpcStatus.OUT_OF_RANGE.code -> HTTP_BAD_REQUEST
diff --git a/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt b/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt
index 0a38cc79057..ec68b182641 100644
--- a/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt
+++ b/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt
@@ -161,13 +161,13 @@ internal class ClientMetricsInterceptorTest {
     assertThat(clientHttp2.ping(AppRequest(200)).execute().code()).isEqualTo(200)
 
     SoftAssertions.assertSoftly { softly ->
-      softly.assertThat(requestDurationSummary.labels("pingerHttp2.ping", "500").get().count.toInt()).isEqualTo(1)
+      softly.assertThat(requestDurationSummary.labels("pingerHttp2.ping", "500").get().count.toInt()).isEqualTo(0)
       softly.assertThat(requestDurationSummary.labels("pingerHttp2.ping", "200").get().count.toInt()).isEqualTo(1)
-      softly.assertThat(requestDurationSummary.labels("pingerHttp2.ping", "400").get().count.toInt()).isEqualTo(1)
+      softly.assertThat(requestDurationSummary.labels("pingerHttp2.ping", "400").get().count.toInt()).isEqualTo(2)
 
-      softly.assertThat(requestDurationHistogram.labels("pingerHttp2.ping", "500").get().buckets.last().toInt()).isEqualTo(1)
+      softly.assertThat(requestDurationHistogram.labels("pingerHttp2.ping", "500").get().buckets.last().toInt()).isEqualTo(0)
       softly.assertThat(requestDurationHistogram.labels("pingerHttp2.ping", "200").get().buckets.last().toInt()).isEqualTo(1)
-      softly.assertThat(requestDurationHistogram.labels("pingerHttp2.ping", "400").get().buckets.last().toInt()).isEqualTo(1)
+      softly.assertThat(requestDurationHistogram.labels("pingerHttp2.ping", "400").get().buckets.last().toInt()).isEqualTo(2)
     }
   }