diff --git a/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx b/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
index 572cd94..8c5aac3 100644
--- a/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
+++ b/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
@@ -7,7 +7,7 @@ import {rolesToColor} from "../../../../utils/functions/rolesToColor";
 export function domainEntitiesToEdges(d: Domain, withRegistrar = false) {
     const rdapRoleTranslated = rdapRoleTranslation()
     return d.entities
-        .filter(e => !withRegistrar ? !e.roles.includes('registrar') : true)
+        .filter(e => !e.deleted && (!withRegistrar ? !e.roles.includes('registrar') : true))
         .map(e => ({
             id: `e-${d.ldhName}-${e.entity.handle}`,
             source: e.roles.includes('registrant') || e.roles.includes('registrar') ? e.entity.handle : d.ldhName,
diff --git a/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx b/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
index 3819bd1..49e58a5 100644
--- a/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
+++ b/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
@@ -13,7 +13,7 @@ export const domainToNode = (d: Domain) => ({
 })
 
 export const domainEntitiesToNode = (d: Domain, withRegistrar = false) => d.entities
-    .filter(e => !withRegistrar ? !e.roles.includes('registrar') : true)
+    .filter(e => !e.deleted && (!withRegistrar ? !e.roles.includes('registrar') : true))
     .map(e => {
         return {
             id: e.entity.handle,