diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index a5bd608b..8ecda85b 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -395,6 +395,8 @@ static void unescape_tag(char *tag)
 	for (; *tmp != '\0'; tmp++, tag++) {
 		if (*tmp == '\\') {
 			tmp++;
+			if (*tmp == '\0')
+				break;
 			switch (*tmp) {
 			case ':':
 				*tag = ';';