diff --git a/packages/portalnetwork/src/networks/contentLookup.ts b/packages/portalnetwork/src/networks/contentLookup.ts
index ce970a806..10701b897 100644
--- a/packages/portalnetwork/src/networks/contentLookup.ts
+++ b/packages/portalnetwork/src/networks/contentLookup.ts
@@ -162,9 +162,10 @@ export class ContentLookup {
     }
 
     this.pending.add(peer.enr.encodeTxt())
+    this.network.portal.enrCache.set(peer.enr.nodeId, peer.enr)
     this.logger(`Requesting content from ${shortId(peer.enr.nodeId)}`)
     try {
-      const res = await this.network.sendFindContent!(peer.enr.encodeTxt(), this.contentKey)
+      const res = await this.network.sendFindContent!(peer.enr.nodeId, this.contentKey)
       this.pending.delete(peer.enr.encodeTxt())
       if (this.finished) {
         this.logger(`Response from ${shortId(peer.enr.nodeId)} arrived after lookup finished`)
diff --git a/packages/portalnetwork/src/networks/history/history.ts b/packages/portalnetwork/src/networks/history/history.ts
index 1b6e65015..64ca4f72e 100644
--- a/packages/portalnetwork/src/networks/history/history.ts
+++ b/packages/portalnetwork/src/networks/history/history.ts
@@ -10,10 +10,9 @@ import {
   RequestCode,
   decodeHistoryNetworkContentKey,
   decodeReceipts,
-  getENR,
   reassembleBlock,
   saveReceipts,
-  shortId,
+  shortId
 } from '../../index.js'
 import { BaseNetwork } from '../network.js'
 import { NetworkId } from '../types.js'
@@ -196,7 +195,7 @@ export class HistoryNetwork extends BaseNetwork {
    * @returns the value of the FOUNDCONTENT response or undefined
    */
   public sendFindContent = async (dstId: string, key: Uint8Array) => {
-    const enr = getENR(this.routingTable, dstId)
+    const enr = this.portal.enrCache.get(dstId)
     if (enr === undefined) {
       this.logger(`No ENR found for ${shortId(dstId)}.  FINDCONTENT aborted.`)
       return undefined