diff --git a/plugin/store.go b/plugin/store.go
index 3c56a5cdc0..1dc78d96b4 100644
--- a/plugin/store.go
+++ b/plugin/store.go
@@ -248,10 +248,8 @@ func (ps *Store) CallHandler(p *v2.Plugin) {
 	}
 }
 
+// resolvePluginID must be protected by ps.RLock
 func (ps *Store) resolvePluginID(idOrName string) (string, error) {
-	ps.RLock() // todo: fix
-	defer ps.RUnlock()
-
 	if validFullID.MatchString(idOrName) {
 		return idOrName, nil
 	}