diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
index 7ddd7fc2dfd5fbeb2ae9c3abda05c094eaa41731..aa517b92a824f6e791b5da7ebebb5a5afe1bf800 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
@@ -285,22 +285,7 @@ public class UIKeystoreService extends BasicKeystoreService {
 
         String keystoreSecToken = configurationService.getKeystoreCredentialToken();
         KeyStore keyStore = loadKeystore(configurationService.getKeystoreFile(), keystoreSecToken);
-        if (keyStore != null) {
-            return list(newKeystore.aliases())
-                    .stream()
-                    .filter(alias -> containsCertificate(keyStore, newKeystore, alias))
-                    .peek(alias -> LOG.debug("Found entry with duplicate certificate [{}]", alias))
-                    .collect(Collectors.toSet());
-        }
-        return Collections.emptySet();
-    }
-
-    private boolean containsCertificate(KeyStore keyStore, KeyStore newKeystore, String alias) {
-        try {
-            return keyStore.getCertificateAlias(newKeystore.getCertificate(alias)) != null;
-        } catch (KeyStoreException e) {
-            throw new SMPRuntimeException(ErrorCode.CERTIFICATE_ERROR, "An error occurred while loading the entry " + alias, e);
-        }
+        return KeystoreUtils.findDuplicateCertificates(keyStore, newKeystore);
     }
 
     /**