diff --git a/src/plugins/irc-events/join.js b/src/plugins/irc-events/join.js
index d93d3965..f889f51d 100644
--- a/src/plugins/irc-events/join.js
+++ b/src/plugins/irc-events/join.js
@@ -24,6 +24,8 @@ module.exports = function(irc, network) {
 
 			// Request channels' modes
 			network.irc.raw("MODE", chan.name);
+		} else if (data.nick === irc.user.nick) {
+			chan.state = Chan.State.JOINED;
 		}
 
 		const user = new User({nick: data.nick});