diff --git a/src/main/java/ch/njol/skript/config/Node.java b/src/main/java/ch/njol/skript/config/Node.java
index 170fd38cf42..afb3ea3d038 100644
--- a/src/main/java/ch/njol/skript/config/Node.java
+++ b/src/main/java/ch/njol/skript/config/Node.java
@@ -128,6 +128,8 @@ public void move(final SectionNode newParent) {
 	 * @return A pair (value, comment).
 	 */
 	public static NonNullPair<String, String> splitLine(final String line) {
+		if (line.trim().startsWith("#"))
+			return new NonNullPair<>("", line.substring(line.indexOf('#')));
 		final Matcher m = linePattern.matcher(line);
 		boolean matches = false;
 		try {
diff --git a/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java b/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java
index e24d28405f2..c7e0eb3b29f 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java
@@ -39,12 +39,12 @@ public void splitLineTest() {
 				{"ab#cd", "ab", "#cd"},
 				{"ab##cd", "ab#cd", ""},
 				{"ab###cd", "ab#", "#cd"},
-				{"######", "###", ""},
-				{"#######", "###", "#"},
-				{"#### # ####", "## ", "# ####"},
-				{"##### ####", "##", "# ####"},
-				{"#### #####", "## ##", "#"},
-				{"#########", "####", "#"},
+				{"######", "", "######"},
+				{"#######", "", "#######"},
+				{"#### # ####", "", "#### # ####"},
+				{"##### ####", "", "##### ####"},
+				{"#### #####", "", "#### #####"},
+				{"#########", "", "#########"},
 				{"a##b#c##d#e", "a#b", "#c##d#e"},
 				{" a ## b # c ## d # e ", " a # b ", "# c ## d # e "},
 		};