diff --git a/src/basic-languages/twig/twig.test.ts b/src/basic-languages/twig/twig.test.ts
index a957eec7..179323b1 100644
--- a/src/basic-languages/twig/twig.test.ts
+++ b/src/basic-languages/twig/twig.test.ts
@@ -734,6 +734,15 @@ testTokenization(
 				tokens: [{ startIndex: 0, type: 'comment.twig' }]
 			}
 		],
+		[
+			{
+				line: 'test {# Hello World! #}',
+				tokens: [
+					{ startIndex: 0, type: '' },
+					{ startIndex: 5, type: 'comment.twig' }
+				]
+			}
+		],
 		[
 			{
 				line: '{#Hello World!#}',
@@ -860,6 +869,19 @@ testTokenization(
 				]
 			}
 		],
+		[
+			{
+				line: 'test {{ foo }}',
+				tokens: [
+					{ startIndex: 0, type: '' },
+					{ startIndex: 5, type: 'delimiter.twig' },
+					{ startIndex: 7, type: '' },
+					{ startIndex: 8, type: 'variable.twig' },
+					{ startIndex: 11, type: '' },
+					{ startIndex: 12, type: 'delimiter.twig' }
+				]
+			}
+		],
 		[
 			{
 				line: '{{ foo(42) }}',
@@ -962,6 +984,17 @@ testTokenization(
 				]
 			}
 		],
+		[
+			{
+				line: 'test {% %}',
+				tokens: [
+					{ startIndex: 0, type: '' },
+					{ startIndex: 5, type: 'delimiter.twig' },
+					{ startIndex: 7, type: '' },
+					{ startIndex: 8, type: 'delimiter.twig' }
+				]
+			}
+		],
 		[
 			{
 				line: '{% for item in navigation %}',
diff --git a/src/basic-languages/twig/twig.ts b/src/basic-languages/twig/twig.ts
index 30a05eb7..2dc7c42c 100644
--- a/src/basic-languages/twig/twig.ts
+++ b/src/basic-languages/twig/twig.ts
@@ -104,7 +104,7 @@ export const language = <languages.IMonarchLanguage>{
 			[/(<)((?:[\w\-]+:)?[\w\-]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
 			[/(<\/)((?:[\w\-]+:)?[\w\-]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
 			[/</, 'delimiter.html'],
-			[/[^<]+/] // text
+			[/[^<{]+/] // text
 		],
 
 		/**