diff --git a/src/peers.c b/src/peers.c
index 39a5382d3..d4aa69f23 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -3472,12 +3472,14 @@ struct task *process_peer_sync(struct task * task, void *context, unsigned int s
 				peers->resync_timeout = tick_add(now_ms, MS_TO_TICKS(PEER_RESYNC_TIMEOUT));
 
 			/* If there's no active peer connection */
-			if (!tick_is_expired(peers->resync_timeout, now_ms) &&
+			if ((peers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FINISHED &&
+			    !tick_is_expired(peers->resync_timeout, now_ms) &&
 			    (ps->statuscode == 0 ||
 			     ps->statuscode == PEER_SESS_SC_SUCCESSCODE ||
 			     ps->statuscode == PEER_SESS_SC_CONNECTEDCODE ||
 			     ps->statuscode == PEER_SESS_SC_TRYAGAIN)) {
-				/* The resync timeout is not expired and
+				/* The resync is finished for the local peer and
+				 *   the resync timeout is not expired and
 				 *   connection never tried
 				 *   or previous peer connection was successfully established
 				 *   or previous tcp connect succeeded but init state incomplete