diff --git a/src/irc/channel.go b/src/irc/channel.go
index 3a347958..b124391e 100644
--- a/src/irc/channel.go
+++ b/src/irc/channel.go
@@ -49,8 +49,8 @@ type ChannelCommand interface {
 // NewChannel creates a new channel from a `Server` and a `name` string, which
 // must be unique on the server.
 func NewChannel(s *Server, name string) *Channel {
-	commands := make(chan ChannelCommand, 1)
-	replies := make(chan Reply, 1)
+	commands := make(chan ChannelCommand)
+	replies := make(chan Reply)
 	channel := &Channel{
 		name:     name,
 		members:  make(UserSet),
diff --git a/src/irc/client.go b/src/irc/client.go
index 351d166d..fbbc2cc1 100644
--- a/src/irc/client.go
+++ b/src/irc/client.go
@@ -31,7 +31,7 @@ type ClientSet map[*Client]bool
 func NewClient(server *Server, conn net.Conn) *Client {
 	read := StringReadChan(conn)
 	write := StringWriteChan(conn)
-	replies := make(chan Reply, 1)
+	replies := make(chan Reply)
 
 	client := &Client{
 		conn:     conn,
diff --git a/src/irc/server.go b/src/irc/server.go
index 467afd67..373e65b4 100644
--- a/src/irc/server.go
+++ b/src/irc/server.go
@@ -29,7 +29,7 @@ type Server struct {
 }
 
 func NewServer(name string) *Server {
-	commands := make(chan Command, 1)
+	commands := make(chan Command)
 	server := &Server{
 		ctime:    time.Now(),
 		name:     name,
diff --git a/src/irc/service.go b/src/irc/service.go
index 581bc13c..162287b2 100644
--- a/src/irc/service.go
+++ b/src/irc/service.go
@@ -29,7 +29,7 @@ type BaseService struct {
 }
 
 func NewService(service EditableService, s *Server, name string) Service {
-	commands := make(chan ServiceCommand, 1)
+	commands := make(chan ServiceCommand)
 	base := &BaseService{
 		server:   s,
 		name:     name,
diff --git a/src/irc/user.go b/src/irc/user.go
index 30d6da60..98c66567 100644
--- a/src/irc/user.go
+++ b/src/irc/user.go
@@ -47,8 +47,8 @@ func (set UserSet) Nicks() []string {
 }
 
 func NewUser(nick string, server *Server) *User {
-	commands := make(chan UserCommand, 1)
-	replies := make(chan Reply, 1)
+	commands := make(chan UserCommand)
+	replies := make(chan Reply)
 	user := &User{
 		nick:     nick,
 		server:   server,