diff --git a/app/lookup/[domain]/page.jsx b/app/lookup/[domain]/page.jsx
index 6cb8fae0..c2909d42 100644
--- a/app/lookup/[domain]/page.jsx
+++ b/app/lookup/[domain]/page.jsx
@@ -33,7 +33,9 @@ const LookupDomain = async ({ params: { domain } }) => {
   return (
     <>
       <div className="grid gap-4 md:grid-cols-4">
-        {whoisResult['Created Date'] || whoisResult['Updated Date'] || whoisResult['Expiry Date'] ? (
+        {whoisResult['Created Date'] ||
+        whoisResult['Updated Date'] ||
+        whoisResult['Expiry Date'] ? (
           <div className="h-full md:col-span-2">
             <div className="h-full rounded-xl bg-slate-100 px-8 py-5 dark:bg-slate-950 md:flex">
               <div>
diff --git a/utils/DnsLookup.ts b/utils/DnsLookup.ts
index c4b547d9..36732ec1 100644
--- a/utils/DnsLookup.ts
+++ b/utils/DnsLookup.ts
@@ -82,10 +82,9 @@ class DnsLookup {
     }
   }
 
-  static async resolveNameservers(
-    domain: string,
-    fromParent = false
-  ): Promise<string[]> {
+  static async fetchRecords(domain: string, recordType: RecordType) {
+    // TODO Reduce duplicate NS lookups
+
     let nameservers: string[] = [];
     let nsDomain = domain;
     while (true) {
@@ -105,25 +104,13 @@ class DnsLookup {
       }
     }
 
-    if (fromParent) {
+    if (recordType === 'DS') {
       // DS records are stored at the parent domain
       nsDomain = nsDomain.replace(/^[^.]+\./, '');
       nameservers = await dns.resolveNs(nsDomain);
     }
 
     const addresses = await dns.resolve4(nameservers[0]);
-    if (addresses.length === 0) {
-      throw new Error('No addresses found for nameserver');
-    }
-
-    return addresses;
-  }
-
-  static async fetchRecords(
-    domain: string,
-    recordType: RecordType,
-    nameservers: string[]
-  ) {
     const packetBuffer = dnsPacket.encode({
       type: 'query',
       id: 1,
@@ -132,7 +119,7 @@ class DnsLookup {
     });
 
     const socket = dgram.createSocket('udp4');
-    socket.send(packetBuffer, 0, packetBuffer.length, 53, nameservers[0]);
+    socket.send(packetBuffer, 0, packetBuffer.length, 53, addresses[0]);
 
     return await new Promise<RawRecord[]>((resolve, reject) => {
       socket.on('message', (message: Buffer) => {
@@ -166,19 +153,8 @@ class DnsLookup {
   }
 
   static async resolveAllRecords(domain: string): Promise<ResolvedRecords> {
-    const [nameservers, parentNameservers] = await Promise.all([
-      DnsLookup.resolveNameservers(domain),
-      DnsLookup.resolveNameservers(domain, true),
-    ]);
-
     const results = await Promise.all(
-      RECORD_TYPES.map((type) =>
-        DnsLookup.fetchRecords(
-          domain,
-          type,
-          type === 'DS' ? parentNameservers : nameservers
-        )
-      )
+      RECORD_TYPES.map((type) => DnsLookup.fetchRecords(domain, type))
     );
 
     return RECORD_TYPES.reduce(