diff --git a/src/msgfile.c b/src/msgfile.c
index 051f5b75c..68f058131 100644
--- a/src/msgfile.c
+++ b/src/msgfile.c
@@ -70,6 +70,10 @@ static void handle_line(struct msg_entries *entries, char *line)
 	char *items[3];
 	int last_item = 0;
 
+	/* Skip comments from the file */
+	if (line[0] == '#')
+		return;
+
 	for (i = 0; i < len; ++i) {
 		if (line[i] == '\n' || line[i] == '\r')
 			line[i] = '\0';
diff --git a/tests/msgfile/msgconfig.cfg b/tests/msgfile/msgconfig.cfg
index dfaad2999..28d74326a 100644
--- a/tests/msgfile/msgconfig.cfg
+++ b/tests/msgfile/msgconfig.cfg
@@ -1 +1,2 @@
+# This is a comment
 *:*::Hello Welt