diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 402aa75d..50fed22b 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -81,7 +81,7 @@ static void event_nick(SERVER_REC *server, const char *data,
 	char *params, *nick;
 
 	query = query_find(server, orignick);
-	if (query != NULL) {
+	if (query != NULL && strcmp(query->name, nick) != 0) {
 		params = event_get_params(data, 1, &nick);
 		query_change_nick(query, nick);
 		g_free(params);