diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 258e01046fb8488aa316255ca47731884f36c0be..521ff740a0f23dd17e0c3b888ecfdcb0a99f98e7 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -332,8 +332,11 @@ public class TunnelPool {
      */
     private int getAdjustedTotalQuantity() {
         int rv = _settings.getTotalQuantity();
-        if (_settings.isExploratory() && _context.netDb().floodfillEnabled())
-            rv += 3;
+        // TODO high-bw non-ff also
+        if (_settings.isExploratory() && _context.netDb().floodfillEnabled() &&
+            _context.router().getUptime() > 5*60*1000) {
+            rv += 2;
+        }
         if (_settings.isExploratory() && rv > 1) {
             RateStat e = _context.statManager().getRate("tunnel.buildExploratoryExpire");
             RateStat r = _context.statManager().getRate("tunnel.buildExploratoryReject");