diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cacf3455..1745146a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -118,7 +118,7 @@ jobs:
           export MAKEFLAGS="-j1"
           export NIMFLAGS="--colors:off -d:chronicles_colors:none"
           
-          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test testwakunode2>>>>>>> master
+          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test testwakunode2
 
   build-docker-image:
     needs: changes
diff --git a/waku/waku_rln_relay/nonce_manager.nim b/waku/waku_rln_relay/nonce_manager.nim
index bb17b696d..6fe463ce1 100644
--- a/waku/waku_rln_relay/nonce_manager.nim
+++ b/waku/waku_rln_relay/nonce_manager.nim
@@ -45,12 +45,13 @@ proc getNonce*(n: NonceManager): NonceManagerResult[Nonce] =
 
   if now - n.lastNonceTime >= n.epoch:
     retNonce = 0
+    n.lastNonceTime = now
+
   n.nextNonce = retNonce + 1
-  n.lastNonceTime = now
 
   if retNonce >= n.nonceLimit:
     return err(
-      NonceManagerError(
+      NonceManagerError( 
         kind: NonceLimitReached,
         error:
           "Nonce limit reached. Please wait for the next epoch. requested nonce: " &