diff --git a/libs/domains/services/feature/src/lib/service-links-popover/service-links-popover.tsx b/libs/domains/services/feature/src/lib/service-links-popover/service-links-popover.tsx
index 8df3d4548c7..0d6eeda057b 100644
--- a/libs/domains/services/feature/src/lib/service-links-popover/service-links-popover.tsx
+++ b/libs/domains/services/feature/src/lib/service-links-popover/service-links-popover.tsx
@@ -37,8 +37,9 @@ export function ServiceLinksPopover({
 
   // Remove default Qovery links
   const filteredLinks = useMemo(
-    () => links.filter((link: LinkProps) => !(link.is_default && link.is_qovery_domain)),
-    [links]
+    () =>
+      links.filter((link: LinkProps) => !(link.is_default && link.is_qovery_domain) && link.service_id === serviceId),
+    [links, serviceId]
   )
 
   // Separate links into nginx and gateway-api groups