diff --git a/packages/enr/src/enr.ts b/packages/enr/src/enr.ts
index 7e5e6160bc..4ae36289f1 100644
--- a/packages/enr/src/enr.ts
+++ b/packages/enr/src/enr.ts
@@ -17,7 +17,7 @@ import debug from "debug";
 
 import { ERR_INVALID_ID } from "./constants.js";
 import { keccak256, verifySignature } from "./crypto.js";
-import { multiaddrFromFields } from "./multiaddr_from_fields.js";
+import { locationMultiaddrFromEnrFields } from "./get_multiaddr.js";
 import { decodeMultiaddrs, encodeMultiaddrs } from "./multiaddrs_codec.js";
 import { createPeerIdFromPublicKey } from "./peer_id.js";
 import * as v4 from "./v4.js";
@@ -231,49 +231,9 @@ export class ENR extends Map<ENRKey, ENRValue> implements IEnr {
     }
   }
 
-  getLocationMultiaddr(
+  getLocationMultiaddr: (
     protocol: "udp" | "udp4" | "udp6" | "tcp" | "tcp4" | "tcp6"
-  ): Multiaddr | undefined {
-    if (protocol === "udp") {
-      return (
-        this.getLocationMultiaddr("udp4") || this.getLocationMultiaddr("udp6")
-      );
-    }
-    if (protocol === "tcp") {
-      return (
-        this.getLocationMultiaddr("tcp4") || this.getLocationMultiaddr("tcp6")
-      );
-    }
-    const isIpv6 = protocol.endsWith("6");
-    const ipVal = this.get(isIpv6 ? "ip6" : "ip");
-    if (!ipVal) {
-      return;
-    }
-
-    const isUdp = protocol.startsWith("udp");
-    const isTcp = protocol.startsWith("tcp");
-    let protoName, protoVal;
-    if (isUdp) {
-      protoName = "udp";
-      protoVal = isIpv6 ? this.get("udp6") : this.get("udp");
-    } else if (isTcp) {
-      protoName = "tcp";
-      protoVal = isIpv6 ? this.get("tcp6") : this.get("tcp");
-    } else {
-      return;
-    }
-
-    if (!protoVal) {
-      return;
-    }
-
-    return multiaddrFromFields(
-      isIpv6 ? "ip6" : "ip4",
-      protoName,
-      ipVal,
-      protoVal
-    );
-  }
+  ) => Multiaddr | undefined = locationMultiaddrFromEnrFields.bind({}, this);
 
   setLocationMultiaddr(multiaddr: Multiaddr): void {
     const protoNames = multiaddr.protoNames();
diff --git a/packages/enr/src/get_multiaddr.ts b/packages/enr/src/get_multiaddr.ts
new file mode 100644
index 0000000000..1f28fac2ac
--- /dev/null
+++ b/packages/enr/src/get_multiaddr.ts
@@ -0,0 +1,47 @@
+import { Multiaddr } from "@multiformats/multiaddr";
+import type { IEnr } from "@waku/interfaces";
+
+import { multiaddrFromFields } from "./multiaddr_from_fields.js";
+
+export function locationMultiaddrFromEnrFields(
+  enr: IEnr,
+  protocol: "udp" | "udp4" | "udp6" | "tcp" | "tcp4" | "tcp6"
+): Multiaddr | undefined {
+  switch (protocol) {
+    case "udp":
+      return (
+        locationMultiaddrFromEnrFields(enr, "udp4") ||
+        locationMultiaddrFromEnrFields(enr, "udp6")
+      );
+    case "tcp":
+      return (
+        locationMultiaddrFromEnrFields(enr, "tcp4") ||
+        locationMultiaddrFromEnrFields(enr, "tcp6")
+      );
+  }
+  const isIpv6 = protocol.endsWith("6");
+  const ipVal = enr.get(isIpv6 ? "ip6" : "ip");
+  if (!ipVal) return;
+
+  const protoName = protocol.slice(0, 3);
+  let protoVal;
+  switch (protoName) {
+    case "udp":
+      protoVal = isIpv6 ? enr.get("udp6") : enr.get("udp");
+      break;
+    case "tcp":
+      protoVal = isIpv6 ? enr.get("tcp6") : enr.get("tcp");
+      break;
+    default:
+      return;
+  }
+
+  if (!protoVal) return;
+
+  return multiaddrFromFields(
+    isIpv6 ? "ip6" : "ip4",
+    protoName,
+    ipVal,
+    protoVal
+  );
+}