diff --git a/src/main/java/org/apache/bookkeeper/Dice.java b/src/main/java/org/apache/bookkeeper/Dice.java
index a57b716..4e7027c 100644
--- a/src/main/java/org/apache/bookkeeper/Dice.java
+++ b/src/main/java/org/apache/bookkeeper/Dice.java
@@ -163,7 +163,7 @@ EntryId lead(EntryId skipPast) throws Exception {
 
     EntryId follow(EntryId skipPast) throws Exception {
         List<Long> ledgers = null;
-        while (ledgers == null) {
+        while (ledgers == null && !leader) {
             try {
                 byte[] ledgerListBytes = curator.getData()
                     .forPath(DICE_LOG);