diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala b/core/src/main/scala/kafka/server/KafkaApis.scala
index 338d1cc..80a70f1 100644
--- a/core/src/main/scala/kafka/server/KafkaApis.scala
+++ b/core/src/main/scala/kafka/server/KafkaApis.scala
@@ -520,7 +520,7 @@ class KafkaApis(val requestChannel: RequestChannel,
       if(metadataRequest.topics.size > 0)
         metadataRequest.topics.toSet
       else
-        ZkUtils.getAllTopics(zkClient).toSet
+        leaderCache.keySet.map(_.topic)
     }
     val topicMetadataList =
       partitionMetadataLock synchronized {