diff --git a/consensus/leader.go b/consensus/leader.go
index 9e901e70c6..b387d2fba6 100644
--- a/consensus/leader.go
+++ b/consensus/leader.go
@@ -337,6 +337,12 @@ func (consensus *Consensus) onCommit(recvMsg *FBFTMessage) {
 		if maxWaitTime > waitTime {
 			waitTime = maxWaitTime
 		}
+		if consensus.Blockchain().Config().IsOneSecond(consensus.Blockchain().CurrentBlock().Epoch()) {
+			waitTime = time.Until(consensus.NextBlockDue) - 200*time.Millisecond
+			if waitTime < 0 {
+				waitTime = 0
+			}
+		}
 		go consensus.finalCommit(waitTime, viewID, consensus.isLeader())
 
 		consensus.msgSender.StopRetry(msg_pb.MessageType_PREPARED)