diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 910c8cfd..822d21cc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: ${{ runner.node }}
+          node-version: ${{ matrix.node }}
       - run: npm install
       - run: npm run build --if-present
       - run: npm test
diff --git a/lib/client/websocket-tracker.js b/lib/client/websocket-tracker.js
index 907b5d37..815b0341 100644
--- a/lib/client/websocket-tracker.js
+++ b/lib/client/websocket-tracker.js
@@ -56,7 +56,7 @@ class WebSocketTracker extends Tracker {
       this._send(params)
     } else {
       // Limit the number of offers that are generated, since it can be slow
-      const numwant = Math.min(opts.numwant, 10)
+      const numwant = Math.min(opts.numwant, 5)
 
       this._generateOffers(numwant, offers => {
         params.numwant = numwant
@@ -278,8 +278,8 @@ class WebSocketTracker extends Tracker {
         if (this._trackerId) params.trackerid = this._trackerId
         this._send(params)
       })
-      peer.signal(data.offer)
       this.client.emit('peer', peer)
+      peer.signal(data.offer)
     }
 
     if (data.answer && data.peer_id) {
@@ -287,8 +287,8 @@ class WebSocketTracker extends Tracker {
       peer = this.peers[offerId]
       if (peer) {
         peer.id = common.binaryToHex(data.peer_id)
-        peer.signal(data.answer)
         this.client.emit('peer', peer)
+        peer.signal(data.answer)
 
         clearTimeout(peer.trackerTimeout)
         peer.trackerTimeout = null
diff --git a/package.json b/package.json
index 213073a3..30507662 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.16.1",
+  "version": "9.17.0",
   "author": {
     "name": "WebTorrent LLC",
     "email": "feross@webtorrent.io",