diff --git a/irc/server.go b/irc/server.go
index 644e12f4..2e0764ea 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -122,7 +122,7 @@ func (s *Server) listen(config ListenerConfig) {
 		if DEBUG_SERVER {
 			log.Print("Server.Accept: ", conn.RemoteAddr())
 		}
-		go NewClient(s, conn)
+		NewClient(s, conn)
 	}
 }