diff --git a/assets/components/tracking/watchlist/TrackedDomainTable.tsx b/assets/components/tracking/watchlist/TrackedDomainTable.tsx
index fa070b8..1a93f65 100644
--- a/assets/components/tracking/watchlist/TrackedDomainTable.tsx
+++ b/assets/components/tracking/watchlist/TrackedDomainTable.tsx
@@ -62,7 +62,7 @@ export function TrackedDomainTable() {
             const notices: ReactElement[] = []
             setDataTable(data['hydra:member'].map((d: Domain) => {
                 const expirationDate = d.events.find(e => e.action === 'expiration' && !e.deleted)?.date
-                const expiresInDays = d.expiresInDays && d.expiresInDays > 0 ? -d.expiresInDays : undefined
+                const expiresInDays = d.expiresInDays && d.expiresInDays > 1 ? -d.expiresInDays : undefined
 
                 if (d.status.includes('redemption period')) {
                     if (!notices.includes(REDEMPTION_NOTICE)) notices.push(REDEMPTION_NOTICE)
@@ -138,12 +138,12 @@ export function TrackedDomainTable() {
                                         </Tooltip>
                         }
                         {
-                            d.expiresInDays && <Tooltip title={t`Estimated number of days until WHOIS removal`}>
+                            d.expiresInDays ? <Tooltip title={t`Estimated number of days until WHOIS removal`}>
                                 <Tag bordered={false}
                                      color={d.expiresInDays <= 5 ? 'red' : d.expiresInDays <= 35 ? 'orange' : 'default'}>
                                     {t`J ${expiresInDays}`}
                                 </Tag>
-                            </Tooltip>
+                            </Tooltip> : undefined
                         }
                     </Flex>
                 }
diff --git a/src/Entity/Domain.php b/src/Entity/Domain.php
index 841843b..3093881 100644
--- a/src/Entity/Domain.php
+++ b/src/Entity/Domain.php
@@ -468,6 +468,7 @@ class Domain
     #[Groups(['domain:item', 'domain:list'])]
     public function getExpiresInDays(): ?int
     {
+        return 0;
         $now = new \DateTimeImmutable();
         $lastStatus = $this->getDomainStatuses()->last();
         $daysToExpiration = null;