diff --git a/indexer/synchronizer.go b/indexer/synchronizer.go
index 59526f54..cf10b15c 100644
--- a/indexer/synchronizer.go
+++ b/indexer/synchronizer.go
@@ -83,7 +83,11 @@ func (sync *synchronizerState) runSync() {
 		// synchronize next epoch
 		syncEpoch := sync.currentEpoch
 
-		lastRetry := retryCount >= 20
+		retryLimit := len(sync.indexer.GetClients())
+		if retryLimit < 30 {
+			retryLimit = 30
+		}
+		lastRetry := retryCount >= retryLimit
 		done, usedClient, err := sync.syncEpoch(syncEpoch, retryCount, lastRetry, skipClients)
 		if done || lastRetry {
 			if err != nil {