diff --git a/management/server/types/account.go b/management/server/types/account.go
index 0bdf2df66..c28a9b164 100644
--- a/management/server/types/account.go
+++ b/management/server/types/account.go
@@ -944,20 +944,7 @@ func (a *Account) resolveRuleEndpoint(
 	validatedPeersMap map[string]struct{},
 ) ([]*nbpeer.Peer, bool) {
 	if resource.Type == ResourceTypePeer && resource.ID != "" {
-		resolvedPeer := a.GetPeer(resource.ID)
-		if resolvedPeer == nil {
-			return []*nbpeer.Peer{}, false
-		}
-		if len(postureChecks) > 0 && !a.validatePostureChecksOnPeer(ctx, postureChecks, resolvedPeer.ID) {
-			return []*nbpeer.Peer{}, false
-		}
-		if _, ok := validatedPeersMap[resolvedPeer.ID]; !ok {
-			return []*nbpeer.Peer{}, false
-		}
-		if resolvedPeer.ID == peerID {
-			return []*nbpeer.Peer{}, true
-		}
-		return []*nbpeer.Peer{resolvedPeer}, false
+		return a.getPeerFromResource(ctx, resource, peerID, postureChecks, validatedPeersMap)
 	}
 	return a.getAllPeersFromGroups(ctx, groups, peerID, postureChecks, validatedPeersMap)
 }