diff --git a/src/Service/InfluxdbService.php b/src/Service/InfluxdbService.php
index d67b190..462837e 100644
--- a/src/Service/InfluxdbService.php
+++ b/src/Service/InfluxdbService.php
@@ -35,11 +35,11 @@ readonly class InfluxdbService
         ]);
     }
 
-    public function addRdapQueryPoint(RdapServer $rdapServer, Domain $domain, array $info): void
+    public function addRdapQueryPoint(RdapServer $rdapServer, string $ldhName, array $info): void
     {
         $this->writePoints(new Point('rdap_query', [
-            'domain' => $domain->getLdhName(),
-            'tld' => $domain->getTld()->getTld(),
+            'ldh_name' => $ldhName,
+            'tld' => $rdapServer->getTld()->getTld(),
             'rdap_server' => $rdapServer->getUrl(),
             'primary_ip' => $info['primary_ip'],
         ], [
diff --git a/src/Service/RDAPService.php b/src/Service/RDAPService.php
index 8adebf1..eda7ab2 100644
--- a/src/Service/RDAPService.php
+++ b/src/Service/RDAPService.php
@@ -167,7 +167,7 @@ readonly class RDAPService
             throw $e;
         } finally {
             if ($this->influxdbEnabled && isset($req)) {
-                $this->influxService->addRdapQueryPoint($rdapServer, $domain, $req->getInfo());
+                $this->influxService->addRdapQueryPoint($rdapServer, $idnDomain, $req->getInfo());
             }
         }