diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 26757e14..a45623d1 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -87,8 +87,10 @@ static void last_msg_add(GSList **list, const char *nick, int own, int max)
 		rec = g_new(LAST_MSG_REC, 1);
 		rec->nick = g_strdup(nick);
 
-		if (g_slist_length(*list) == max)
-			*list = g_slist_remove(*list, (*list)->data);
+		if (g_slist_length(*list) == max) {
+			*list = g_slist_remove(*list,
+					       g_slist_last(*list)->data);
+		}
 
 		rec->own = own ? max : 0;
 	}