diff --git a/src/Repository/DomainRepository.php b/src/Repository/DomainRepository.php
index 7dcf147..992fd2a 100644
--- a/src/Repository/DomainRepository.php
+++ b/src/Repository/DomainRepository.php
@@ -21,8 +21,8 @@ class DomainRepository extends ServiceEntityRepository
         return $this->createQueryBuilder('d')
                 ->addSelect('events')
                 ->leftJoin('d.events', 'events')
-                ->where('d.tld = :tld')
-                ->setParameter('tld', $tld)
+                ->where('d.tld = :dot')
+                ->setParameter('dot', $tld)
                 ->getQuery()
                 ->getResult();
     }
diff --git a/src/Service/OfficialDataService.php b/src/Service/OfficialDataService.php
index 2dba2ca..b8d1c6e 100644
--- a/src/Service/OfficialDataService.php
+++ b/src/Service/OfficialDataService.php
@@ -168,8 +168,8 @@ class OfficialDataService
             $this->tldRepository->createQueryBuilder('t')
                 ->update()
                 ->set('t.deletedAt', 'COALESCE(t.removalDate, CURRENT_TIMESTAMP())')
-                ->where('t.tld != :tld')
-                ->setParameter('tld', self::DOMAIN_DOT)
+                ->where('t.tld != :dot')
+                ->setParameter('dot', self::DOMAIN_DOT)
                 ->getQuery()->execute();
 
             $tldEntity = $this->tldRepository->findOneBy(['tld' => $tld]);
@@ -181,6 +181,8 @@ class OfficialDataService
                 $this->logger->notice('New TLD detected according to IANA', [
                     'tld' => $tld,
                 ]);
+            } else {
+                $this->em->refresh($tldEntity);
             }
 
             $type = $this->getTldType($tld);
diff --git a/src/Service/RDAPService.php b/src/Service/RDAPService.php
index 95b663e..2571ca8 100644
--- a/src/Service/RDAPService.php
+++ b/src/Service/RDAPService.php
@@ -425,6 +425,8 @@ class RDAPService
 
             if (null === $domainEntity) {
                 $domainEntity = new DomainEntity();
+            } else {
+                $this->em->refresh($domainEntity);
             }
 
             $domain->addDomainEntity($domainEntity