diff --git a/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java b/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java
index f233000f..e55b97dc 100644
--- a/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java
+++ b/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java
@@ -286,10 +286,10 @@ public CatchUpReqMessage initiateCatchUpRequestMessage(NeighbourMessage neighbou
 
         // If peer has the same voter set id
         if (neighbourMessage.getSetId().equals(setId)) {
-            BigInteger latestRound = roundCache.getLatestRoundNumber(setId);
 
             // Check if needed to catch-up peer
-            if (neighbourMessage.getRound().compareTo(latestRound.add(CATCH_UP_THRESHOLD)) >= 0) {
+            if (neighbourMessage.getRound().compareTo(
+                    lastFinalizedRound.getRoundNumber().add(CATCH_UP_THRESHOLD)) >= 0) {
                 log.log(Level.FINE, "Neighbor message indicates that the round of Peer " + peerId + " is ahead.");
 
                 catchUpReqMessage = CatchUpReqMessage.builder()