diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 8fafcd0bac..741274439c 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 8fafcd0bac9f409091b7bcaee62ab6330f57441e
+Subproject commit 741274439ce72162ab3c740e7c0ef624d32725f9
diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim
index ee6d91b9bd..5f0d4783aa 100644
--- a/waku/waku_rln_relay/rln_relay.nim
+++ b/waku/waku_rln_relay/rln_relay.nim
@@ -417,9 +417,6 @@ proc generateRlnValidator*(
   return validator
 
 proc monitorEpochs(wakuRlnRelay: WakuRLNRelay): Future[void] {.async.} =
-  let nextEpochTime = wakuRlnRelay.nextEpoch(epochTime())
-  await sleepAsync(int((nextEpochTime - epochTime()) * 1000))
-
   while true:
     try:
       waku_rln_remaining_proofs_per_epoch.set(
@@ -427,6 +424,8 @@ proc monitorEpochs(wakuRlnRelay: WakuRLNRelay): Future[void] {.async.} =
       )
     except CatchableError:
       error "Error in epoch monitoring", error = getCurrentExceptionMsg()
+
+    let nextEpochTime = wakuRlnRelay.nextEpoch(epochTime())
     await sleepAsync(int(wakuRlnRelay.rlnEpochSizeSec * 1000))
 
 proc mount(