diff --git a/lib/server.js b/lib/server.js
index d16f030c..a26d26e8 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -116,6 +116,16 @@ function connect(params) {
 	client.nick(params.nick);
 	client.user(params.nick, params.realname);
 	
+	events.forEach(function(e) {
+		client.on(e, function() {
+			event.apply(network, [e, arguments]);
+		});
+	});
+	
+	if (!params.onConnect) {
+		return;
+	}
+	
 	client.once("welcome", function() {
 		(params.onConnect.join || []).forEach(function(chan) {
 			client.join.apply(
@@ -140,12 +150,6 @@ function connect(params) {
 			delay += 1000;
 		});
 	});
-	
-	events.forEach(function(e) {
-		client.on(e, function() {
-			event.apply(network, [e, arguments]);
-		});
-	});
 }
 
 function auth(password) {