diff --git a/core/src/main/scala/kafka/network/RequestChannel.scala b/core/src/main/scala/kafka/network/RequestChannel.scala
index e71a06b..305a7fc 100644
--- a/core/src/main/scala/kafka/network/RequestChannel.scala
+++ b/core/src/main/scala/kafka/network/RequestChannel.scala
@@ -289,6 +289,9 @@ object RequestMetrics {
   val followFetchMetricName = ApiKeys.FETCH.name + "Follower"
   (ApiKeys.values().toList.map(e => e.name)
     ++ List(consumerFetchMetricName, followFetchMetricName)).foreach(name => metricsMap.put(name, new RequestMetrics(name)))
+  def clear() {
+    if (metricsMap != null) metricsMap.clear()
+  }
 }
 
 class RequestMetrics(name: String) extends KafkaMetricsGroup {
diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala
index 875652d..fd39b10 100644
--- a/core/src/main/scala/kafka/network/SocketServer.scala
+++ b/core/src/main/scala/kafka/network/SocketServer.scala
@@ -140,6 +140,7 @@ class SocketServer(val config: KafkaConfig, val metrics: Metrics, val time: Time
       acceptors.values.foreach(_.shutdown)
       processors.foreach(_.shutdown)
     }
+    RequestMetrics.clear()
     info("Shutdown completed")
   }