diff --git a/irc/client.go b/irc/client.go
index f0658464..cc970084 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -44,7 +44,7 @@ func NewClient(server *Server, conn net.Conn) *Client {
 		phase:    server.InitPhase(),
 		server:   server,
 		socket:   NewSocket(conn),
-		replies:  make(chan Reply, 16),
+		replies:  make(chan Reply),
 	}
 
 	client.loginTimer = time.AfterFunc(LOGIN_TIMEOUT, client.connectionTimeout)
diff --git a/irc/server.go b/irc/server.go
index 9de056a2..c99f87cf 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -30,10 +30,10 @@ func NewServer(config *Config) *Server {
 	server := &Server{
 		channels:  make(ChannelNameMap),
 		clients:   make(ClientNameMap),
-		commands:  make(chan Command, 16),
-		conns:     make(chan net.Conn, 16),
+		commands:  make(chan Command),
+		conns:     make(chan net.Conn),
 		ctime:     time.Now(),
-		idle:      make(chan *Client, 16),
+		idle:      make(chan *Client),
 		motdFile:  config.MOTD,
 		name:      config.Name,
 		operators: make(map[string]string),