diff --git a/tools/notaryhealthcheck/src/main/kotlin/net/corda/notaryhealthcheck/flows/HealthCheckNotaryClientFlow.kt b/tools/notaryhealthcheck/src/main/kotlin/net/corda/notaryhealthcheck/flows/HealthCheckNotaryClientFlow.kt
index 28fea93083..09cf9634f4 100644
--- a/tools/notaryhealthcheck/src/main/kotlin/net/corda/notaryhealthcheck/flows/HealthCheckNotaryClientFlow.kt
+++ b/tools/notaryhealthcheck/src/main/kotlin/net/corda/notaryhealthcheck/flows/HealthCheckNotaryClientFlow.kt
@@ -28,9 +28,7 @@ class HealthCheckNotaryClientFlow(
         val notaryParty = checkTransaction()
 
         val parties = if (checkEntireCluster) {
-            serviceHub.networkMapCache
-                    .getNodesByLegalIdentityKey(notaryParty.owningKey)
-                    .map { it.legalIdentities.first() }
+            serviceHub.networkMapCache.notaryIdentities.filter { it.owningKey == notaryParty.owningKey }
         } else {
             listOf(notaryParty)
         }