diff --git a/core/src/main/scala/kafka/cluster/Partition.scala b/core/src/main/scala/kafka/cluster/Partition.scala
index a9bb3c8..60f3ed4 100644
--- a/core/src/main/scala/kafka/cluster/Partition.scala
+++ b/core/src/main/scala/kafka/cluster/Partition.scala
@@ -69,7 +69,12 @@ class Partition(val topic: String,
 
   def isUnderReplicated(): Boolean = {
     leaderIsrUpdateLock synchronized {
-      inSyncReplicas.size < replicationFactor
+      leaderReplicaIfLocal() match {
+        case Some(_) =>
+          inSyncReplicas.size < replicationFactor
+        case None =>
+          false
+      }
     }
   }