diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index c2ad44d8..f9539ff3 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -62,7 +62,7 @@ static void nick_hash_remove(CHANNEL_REC *channel, NICK_REC *nick)
 
 	if (list == nick || list->next == NULL) {
 		g_hash_table_remove(channel->nicks, nick->nick);
-		if (list == nick) {
+		if (list->next != NULL) {
 			g_hash_table_insert(channel->nicks, nick->next->nick,
 					    nick->next);
 		}