diff --git a/src/modules/utf8only.c b/src/modules/utf8only.c
index 7fe7bbd2b..5cc7e6367 100644
--- a/src/modules/utf8only.c
+++ b/src/modules/utf8only.c
@@ -114,7 +114,7 @@ const char *parse_get_command(const char *msg)
 	/* Skip message tags (if any) */
 	if (*p == '@')
 	{
-		for (p = p + 1; *p != ' '; p++);
+		for (p++; *p && (*p != ' '); p++);
 		for (; *p == ' '; p++);
 	}