diff --git a/common/src/main/java/net/blay09/mods/balm/notoml/NotomlParserState.java b/common/src/main/java/net/blay09/mods/balm/notoml/NotomlParserState.java
index d4db6c60..a58dd19c 100644
--- a/common/src/main/java/net/blay09/mods/balm/notoml/NotomlParserState.java
+++ b/common/src/main/java/net/blay09/mods/balm/notoml/NotomlParserState.java
@@ -106,7 +106,11 @@ void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsume
         @Override
         void next(NotomlStateMachine state, NotomlParseBuffer buffer, NotomlTokenConsumer consumer) {
             buffer.consumeWhitespace();
-            if (buffer.next("\"", "'")) {
+            if (buffer.nextConsume("#")) {
+                String value = buffer.readUntil("\n", "\r\n", "\r").trim();
+                consumer.emitComment(value);
+                state.transition(List);
+            } else if (buffer.next("\"", "'")) {
                 String value = buffer.readQuoted();
                 consumer.emitPropertyValue(value);
                 state.transition(List);