diff --git a/domain/src/main/java/org/fao/geonet/repository/specification/LinkSpecs.java b/domain/src/main/java/org/fao/geonet/repository/specification/LinkSpecs.java
index cd77c680549..279096be47f 100644
--- a/domain/src/main/java/org/fao/geonet/repository/specification/LinkSpecs.java
+++ b/domain/src/main/java/org/fao/geonet/repository/specification/LinkSpecs.java
@@ -146,4 +146,16 @@ public Predicate toPredicate(Root<Link> root, CriteriaQuery<?> query, CriteriaBu
             }
         };
     }
+
+    public static Specification<Link> filterOnRecords(Integer[] mdIds) {
+
+        return new Specification<Link>() {
+            @Override
+            public Predicate toPredicate(Root<Link> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                query.distinct(true);
+                Join<Link, MetadataLink> metadataJoin = (Join<Link, MetadataLink>) root.fetch(Link_.records, JoinType.LEFT);
+                return cb.and(metadataJoin.get(MetadataLink_.metadataId).in(mdIds));
+            }
+        };
+    }
 }
diff --git a/services/src/main/java/org/fao/geonet/api/links/MAnalyseProcess.java b/services/src/main/java/org/fao/geonet/api/links/MAnalyseProcess.java
index 52df584dabe..405d6aa0b3f 100644
--- a/services/src/main/java/org/fao/geonet/api/links/MAnalyseProcess.java
+++ b/services/src/main/java/org/fao/geonet/api/links/MAnalyseProcess.java
@@ -7,6 +7,7 @@
 import org.fao.geonet.kernel.url.UrlAnalyzer;
 import org.fao.geonet.repository.LinkRepository;
 import org.fao.geonet.repository.MetadataRepository;
+import org.fao.geonet.repository.specification.LinkSpecs;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.springframework.context.ApplicationContext;
@@ -143,29 +144,18 @@ public Object doInTransaction(TransactionStatus transaction) throws Throwable {
                 e.printStackTrace();
             }
         }
-        if (testLink) {
-            testLink(null);
-        }
+        if (!testLink || ids.size() == 0) {
+            return;
     }
 
+        List<Link> links = linkRepository.findAll(LinkSpecs.filterOnRecords(ids.toArray(new Integer[0])));
 
-    public void testLink(List<String> links) throws JDOMException, IOException {
-        List<Link> linkList;
-        if (links == null) {
-            linkList = linkRepository.findAll();
-        } else {
-            linkList = linkRepository.findAllByUrlIn(links);
-        }
-        urlToCheckCount = linkList.size();
         runInNewTransaction("manalyseprocess-testlink", new TransactionTask<Object>() {
             @Override
             public Object doInTransaction(TransactionStatus transaction) throws Throwable {
                 testLinkDate = System.currentTimeMillis();
-                urlToCheckCount = linkList.size();
-                linkList
-                    .parallelStream()
-                    .peek(urlAnalyser::testLink)
-                    .forEach(x -> urlChecked.getAndIncrement());
+                urlToCheckCount = links.size();
+                links.parallelStream().peek(urlAnalyser::testLink).forEach(x -> urlChecked.getAndIncrement());
                 return null;
             }
         });