diff --git a/index.js b/index.js
index c61a82af..6e1bf4ad 100644
--- a/index.js
+++ b/index.js
@@ -64,6 +64,8 @@ function WebTorrent (opts) {
   self.downloadSpeed = speedometer()
   self.uploadSpeed = speedometer()
 
+  self.maxPeers = (Number(opts.maxPeers) && opts.maxPeers !== 0) ? opts.maxPeers : undefined
+
   self.peerId = typeof opts.peerId === 'string'
     ? opts.peerId
     : (opts.peerId || new Buffer(VERSION_PREFIX + hat(48))).toString('hex')
diff --git a/lib/torrent.js b/lib/torrent.js
index 71ee9dcb..126c7b21 100644
--- a/lib/torrent.js
+++ b/lib/torrent.js
@@ -203,7 +203,8 @@ Torrent.prototype._onParsedTorrent = function (parsedTorrent) {
   self.swarm = new Swarm(self.infoHash, self.client.peerId, {
     handshake: {
       dht: self.private ? false : !!self.client.dht
-    }
+    },
+    maxConns: self.client.maxPeers
   })
   self.swarm.on('error', self._onError.bind(self))
   self.swarm.on('wire', self._onWire.bind(self))