diff --git a/assets/pages/StatisticsPage.tsx b/assets/pages/StatisticsPage.tsx
index fe22b0c..4f41c74 100644
--- a/assets/pages/StatisticsPage.tsx
+++ b/assets/pages/StatisticsPage.tsx
@@ -111,7 +111,7 @@ export default function StatisticsPage() {
                         <Card bordered={false}>
                             <Statistic
                                 loading={stats === undefined}
-                                title={`.${tld}`}
+                                title={tld ? `.${tld}` : t`TLD`}
                                 value={domain}
                                 valueStyle={{color: 'darkorange'}}
                             />
diff --git a/src/Service/RDAPService.php b/src/Service/RDAPService.php
index 75e0388..9c755aa 100644
--- a/src/Service/RDAPService.php
+++ b/src/Service/RDAPService.php
@@ -170,18 +170,27 @@ readonly class RDAPService
         return $domain;
     }
 
-    private function getTld($domain): ?object
+    private function getTld($domain): Tld
     {
         if (!str_contains($domain, '.')) {
-            return $this->tldRepository->findOneBy(['tld' => '']);
+            $tldEntity = $this->tldRepository->findOneBy(['tld' => '']);
+
+            if (null == $tldEntity) {
+                throw new NotFoundHttpException('The requested TLD is not yet supported, please try again with another one');
+            }
+
+            return $tldEntity;
         }
+
         $lastDotPosition = strrpos($domain, '.');
+
         if (false === $lastDotPosition) {
             throw new BadRequestException('Domain must contain at least one dot');
         }
 
         $tld = strtolower(idn_to_ascii(substr($domain, $lastDotPosition + 1)));
         $tldEntity = $this->tldRepository->findOneBy(['tld' => $tld]);
+
         if (null === $tldEntity) {
             throw new NotFoundHttpException('The requested TLD is not yet supported, please try again with another one');
         }
@@ -610,19 +619,20 @@ readonly class RDAPService
     {
         foreach ($dnsRoot['services'] as $service) {
             foreach ($service[0] as $tld) {
-                if ('' === $tld) {
-                    if (null === $this->tldRepository->findOneBy(['tld' => $tld])) {
-                        $this->em->persist((new Tld())->setTld('.')->setType(TldType::root));
-                        $this->em->flush();
-                    }
+                if ('' === $tld && null === $this->tldRepository->findOneBy(['tld' => $tld])) {
+                    $this->em->persist((new Tld())->setTld('')->setType(TldType::root));
+                    $this->em->flush();
                 }
+
                 $tldReference = $this->em->getReference(Tld::class, $tld);
 
                 foreach ($service[1] as $rdapServerUrl) {
                     $server = $this->rdapServerRepository->findOneBy(['tld' => $tldReference, 'url' => $rdapServerUrl]);
+
                     if (null === $server) {
                         $server = new RdapServer();
                     }
+
                     $server
                         ->setTld($tldReference)
                         ->setUrl($rdapServerUrl)
diff --git a/translations/translations.pot b/translations/translations.pot
index b35f828..3f05745 100644
--- a/translations/translations.pot
+++ b/translations/translations.pot
@@ -175,6 +175,7 @@ msgid "Domain Finder"
 msgstr ""
 
 #: assets/components/Sider.tsx:49
+#: assets/pages/StatisticsPage.tsx:114
 #: assets/pages/search/TldPage.tsx:79
 msgid "TLD"
 msgstr ""