diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index 939a35f54..9348985fc 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -203,8 +203,8 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
   let peerManager = PeerManager.new(
     switch = switch,
     storage = builder.peerStorage.get(nil),
-    maxRelayPeers = builder.maxRelayPeers,
-    maxServicePeers = builder.maxServicePeers,
+    maxRelayPeers = some(builder.maxRelayPeers),
+    maxServicePeers = some(builder.maxServicePeers),
     colocationLimit = builder.colocationLimit,
     shardedPeerManagement = builder.shardAware,
   )