diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index 3589453d..42ad216c 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -32,10 +32,6 @@ module.exports = function(irc, network) {
 				return;
 			}
 
-			chan.removeUser(user);
-			user.nick = data.new_nick;
-			chan.setUser(user);
-
 			msg = new Msg({
 				time: data.time,
 				from: user,
@@ -45,7 +41,9 @@ module.exports = function(irc, network) {
 			});
 			chan.pushMessage(client, msg);
 
+			chan.removeUser(user);
 			user.nick = data.new_nick;
+			chan.setUser(user);
 
 			client.emit("users", {
 				chan: chan.id,