diff --git a/src/dht/dht-peer-routing.js b/src/dht/dht-peer-routing.js
index 61d79f92..762abc80 100644
--- a/src/dht/dht-peer-routing.js
+++ b/src/dht/dht-peer-routing.js
@@ -27,12 +27,8 @@ class DHTPeerRouting {
    */
   async findPeer (peerId, options = {}) {
     for await (const event of this._dht.findPeer(peerId, options)) {
-      if (event.name === 'PEER_RESPONSE') {
-        const peer = event.closer.find(peerData => peerData.id.equals(peerId))
-
-        if (peer) {
-          return peer
-        }
+      if (event.name === 'FINAL_PEER') {
+        return event.peer
       }
     }