diff --git a/management/server/policy.go b/management/server/policy.go
index 0eb2fb538..d7e27a1b5 100644
--- a/management/server/policy.go
+++ b/management/server/policy.go
@@ -493,7 +493,11 @@ func getAllPeersFromGroups(account *Account, groups []string, peerID string) ([]
 
 		for _, p := range group.Peers {
 			peer, ok := account.Peers[p]
-			if ok && peer != nil && peer.ID == peerID {
+			if !ok || peer == nil {
+				continue
+			}
+
+			if peer.ID == peerID {
 				peerInGroups = true
 				continue
 			}