diff --git a/node/api.go b/node/api.go
index f081fa8a54..3ad49dd679 100644
--- a/node/api.go
+++ b/node/api.go
@@ -72,10 +72,8 @@ func (api *adminAPI) AddPeer(url string) (bool, error) {
 		}
 	}
 	// reject the node which is in peer blacklist
-	if len(server.BlackPeers) > 0 {
-		if _, ok := server.BlackPeers[node.ID]; ok {
-			return false, fmt.Errorf("peer is in blacklist: %v, ID: %s", url, node.ID)
-		}
+	if _, ok := server.BlackPeers[node.ID]; ok {
+		return false, fmt.Errorf("peer is in blacklist: %v, ID: %s", url, node.ID)
 	}
 	server.AddPeer(node)
 	return true, nil
@@ -115,10 +113,8 @@ func (api *adminAPI) AddTrustedPeer(url string) (bool, error) {
 		}
 	}
 	// reject the node which is in peer blacklist
-	if len(server.BlackPeers) > 0 {
-		if _, ok := server.BlackPeers[node.ID]; ok {
-			return false, fmt.Errorf("trusted peer is in blacklist: %v, ID: %s", url, node.ID)
-		}
+	if _, ok := server.BlackPeers[node.ID]; ok {
+		return false, fmt.Errorf("trusted peer is in blacklist: %v, ID: %s", url, node.ID)
 	}
 	server.AddTrustedPeer(node)
 	return true, nil
diff --git a/p2p/server.go b/p2p/server.go
index 58d5f69a90..e3c5b78849 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -905,11 +905,9 @@ func (srv *Server) setupConn(c *conn, flags connFlag, dialDest *discover.Node) e
 			return DiscNonWhitelistedPeer
 		}
 	}
-	if len(srv.BlackPeers) > 0 {
-		if _, ok := srv.BlackPeers[c.id]; ok {
-			clog.Debug("Reject blacklisted peer")
-			return DiscBlacklistedPeer
-		}
+	if _, ok := srv.BlackPeers[c.id]; ok {
+		clog.Debug("Reject blacklisted peer")
+		return DiscBlacklistedPeer
 	}
 	// For dialed connections, check that the remote public key matches.
 	if dialDest != nil && c.id != dialDest.ID {