diff --git a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
index 45757c5691..d5da3da64c 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
@@ -39,6 +39,7 @@ import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import net.tomp2p.connection.ChannelClientConfiguration;
 import net.tomp2p.dht.PeerBuilderDHT;
 import net.tomp2p.dht.PeerDHT;
 import net.tomp2p.dht.StorageLayer;
@@ -118,7 +119,10 @@ class BootstrappedPeerFactory {
             Number160 peerId = Utils.makeSHAHash(keyPair.getPublic().getEncoded());
             PeerMapConfiguration pmc = new PeerMapConfiguration(peerId).peerNoVerification();
             PeerMap pm = new PeerMap(pmc);
-            peer = new PeerBuilder(keyPair).ports(port).peerMap(pm).start();
+            ChannelClientConfiguration cc = PeerBuilder.createDefaultChannelClientConfiguration();
+            cc.maxPermitsTCP(100);
+            cc.maxPermitsUDP(100);
+            peer = new PeerBuilder(keyPair).ports(port).peerMap(pm).channelClientConfiguration(cc).start();
             peerDHT = new PeerBuilderDHT(peer).storageLayer(new StorageLayer(storage)).start();
 
             peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
diff --git a/src/test/java/io/bitsquare/msg/TomP2PTests.java b/src/test/java/io/bitsquare/msg/TomP2PTests.java
index f7a70a6298..97bf06484a 100644
--- a/src/test/java/io/bitsquare/msg/TomP2PTests.java
+++ b/src/test/java/io/bitsquare/msg/TomP2PTests.java
@@ -314,7 +314,8 @@ public class TomP2PTests {
             ChannelClientConfiguration cc = PeerBuilder.createDefaultChannelClientConfiguration();
             cc.maxPermitsTCP(100);
             cc.maxPermitsUDP(100);
-            peer = new PeerBuilder(peerId).bindings(getBindings()).peerMap(pm).ports(clientPort).start();
+            peer = new PeerBuilder(peerId).bindings(getBindings()).channelClientConfiguration(cc).peerMap(pm)
+                    .ports(clientPort).start();
             FutureDiscover futureDiscover = peer.discover().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
             futureDiscover.awaitUninterruptibly();
             if (futureDiscover.isSuccess()) {