diff --git a/server.go b/server.go
index 88fc9163..b813bc01 100644
--- a/server.go
+++ b/server.go
@@ -1438,6 +1438,11 @@ func (s *server) handleQuery(state *peerState, querymsg interface{}) {
 
 	case connectNodeMsg:
 		// XXX(oga) duplicate oneshots?
+		// Limit max number of total peers.
+		if state.Count() >= cfg.MaxPeers {
+			msg.reply <- errors.New("max peers reached")
+			return
+		}
 		for _, peer := range state.persistentPeers {
 			if peer.Addr() == msg.addr {
 				if msg.permanent {