diff --git a/node/src/main/kotlin/net/corda/node/services/keys/BasicHSMKeyManagementService.kt b/node/src/main/kotlin/net/corda/node/services/keys/BasicHSMKeyManagementService.kt
index 5175e67be0..aeeac903c3 100644
--- a/node/src/main/kotlin/net/corda/node/services/keys/BasicHSMKeyManagementService.kt
+++ b/node/src/main/kotlin/net/corda/node/services/keys/BasicHSMKeyManagementService.kt
@@ -95,7 +95,7 @@ class BasicHSMKeyManagementService(cacheFactory: NamedCacheFactory,
     }
 
     override fun filterMyKeys(candidateKeys: Iterable<PublicKey>): Iterable<PublicKey> = database.transaction {
-        identityService.stripNotOurKeys(candidateKeys)
+        candidateKeys.filter(::containsPublicKey)
     }
 
     override fun freshKeyInternal(externalId: UUID?): PublicKey {
diff --git a/node/src/test/kotlin/net/corda/node/services/keys/FilterMyKeysTests.kt b/node/src/test/kotlin/net/corda/node/services/keys/FilterMyKeysTests.kt
new file mode 100644
index 0000000000..cc5cc12f15
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/services/keys/FilterMyKeysTests.kt
@@ -0,0 +1,27 @@
+package net.corda.node.services.keys
+
+import net.corda.core.crypto.Crypto
+import net.corda.core.identity.CordaX500Name
+import net.corda.testing.common.internal.testNetworkParameters
+import net.corda.testing.core.TestIdentity
+import net.corda.testing.node.MockServices
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class FilterMyKeysTests {
+    @Test
+    fun test() {
+        val name = CordaX500Name("Roger", "Office", "GB")
+        val (_, services) = MockServices.makeTestDatabaseAndPersistentServices(
+                cordappPackages = emptyList(),
+                initialIdentity = TestIdentity(name),
+                networkParameters = testNetworkParameters(),
+                moreKeys = emptySet(),
+                moreIdentities = emptySet()
+        )
+        val ourKey = services.keyManagementService.freshKey()
+        val notOurKey = Crypto.generateKeyPair().public
+        val result = services.keyManagementService.filterMyKeys(listOf(ourKey, notOurKey))
+        assertEquals(listOf(ourKey), result)
+    }
+}
\ No newline at end of file