config.go | 31 +++++++++++++++++--------------

diff --git a/config.go b/config.go
index 273c40009946688d454e948bd5ba9dd569a2662b..4ac212d65f27283cb72df5d9d43dbdeff551f54a 100644
--- a/config.go
+++ b/config.go
@@ -135,23 +135,26 @@ 	return cfg
 }
 
 func NewDefaultClientConfig() *ClientConfig {
-	return &ClientConfig{
+	cc := &ClientConfig{
 		HTTPUserAgent:                  DefaultHTTPUserAgent,
 		ExtendedHandshakeClientVersion: "go.torrent dev 20181121",
-		Bep20:                      "-GT0002-",
-		NominalDialTimeout:         20 * time.Second,
-		MinDialTimeout:             3 * time.Second,
-		EstablishedConnsPerTorrent: 50,
-		HalfOpenConnsPerTorrent:    25,
-		TorrentPeersHighWater:      500,
-		TorrentPeersLowWater:       50,
-		HandshakesTimeout:          4 * time.Second,
-		DhtStartingNodes:           dht.GlobalBootstrapAddrs,
-		ListenHost:                 func(string) string { return "" },
-		UploadRateLimiter:          unlimited,
-		DownloadRateLimiter:        unlimited,
-		ConnTracker:                conntrack.NewInstance(),
+		Bep20:                          "-GT0002-",
+		NominalDialTimeout:             20 * time.Second,
+		MinDialTimeout:                 3 * time.Second,
+		EstablishedConnsPerTorrent:     50,
+		HalfOpenConnsPerTorrent:        25,
+		TorrentPeersHighWater:          500,
+		TorrentPeersLowWater:           50,
+		HandshakesTimeout:              4 * time.Second,
+		DhtStartingNodes:               dht.GlobalBootstrapAddrs,
+		ListenHost:                     func(string) string { return "" },
+		UploadRateLimiter:              unlimited,
+		DownloadRateLimiter:            unlimited,
+		ConnTracker:                    conntrack.NewInstance(),
 	}
+	cc.ConnTracker.SetNoMaxEntries()
+	cc.ConnTracker.Timeout = func(conntrack.Entry) time.Duration { return 0 }
+	return cc
 }
 
 type EncryptionPolicy struct {