diff --git a/go/keymanager/client/client.go b/go/keymanager/client/client.go
index 111d7a573f0..e5236fdd0a5 100644
--- a/go/keymanager/client/client.go
+++ b/go/keymanager/client/client.go
@@ -125,8 +125,14 @@ func (c *Client) worker() {
 		case rt := <-rtCh:
 			kmID = rt.KeyManager
 			if kmID == nil {
-				c.logger.Warn("runtime indicates no key manager is needed")
-				continue
+				if rt.Kind != registry.KindKeyManager {
+					c.logger.Warn("runtime indicates no key manager is needed")
+					continue
+				}
+
+				// We're a key manager client, that's interested in other
+				// instances of ourself.
+				kmID = &rt.ID
 			}
 
 			// Fetch current key manager status.