diff --git a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
index 06b429b194..6c636d9e74 100644
--- a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
+++ b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
@@ -347,12 +347,7 @@ class NodeRegistrationHelper(
         if (principalMatchesCertificatePrincipal(tlsCertCrlIssuer, rootCert)) {
             return rootCert
         }
-        val trustStore = config.p2pSslOptions.trustStore.getOptional()
-        return if (trustStore != null) {
-            findMatchingCertificate(tlsCertCrlIssuer, trustStore.value)
-        } else {
-            null
-        }
+        return findMatchingCertificate(tlsCertCrlIssuer, rootTrustStore)
     }
 
     override fun isTlsCrlIssuerCertRequired(): Boolean {