diff --git a/src/php/php.test.ts b/src/php/php.test.ts
index 38f6cdd1..707fb76b 100644
--- a/src/php/php.test.ts
+++ b/src/php/php.test.ts
@@ -2076,5 +2076,23 @@ testTokenization(['php', 'css', 'javascript'], [
 			{ startIndex: 17, type: '' },
 			{ startIndex: 18, type: 'metatag.php' }
 		]
+	}],
+
+	[{
+		line: '<?php',
+		tokens: [
+			{ startIndex: 0, type: 'metatag.php' },
+		]
+	}, {
+		line: '  //',
+		tokens: [
+			{ startIndex: 0, type: '' },
+			{ startIndex: 2, type: 'comment.php' },
+		]
+	}, {
+		line: 'if',
+		tokens: [
+			{ startIndex: 0, type: 'keyword.php' },
+		]
 	}]
 ]);
diff --git a/src/php/php.ts b/src/php/php.ts
index 5848206a..4185047b 100644
--- a/src/php/php.ts
+++ b/src/php/php.ts
@@ -225,8 +225,8 @@ export const language = <ILanguage>{
 			[/[ \t\r\n]+/],
 
 			// comments
-			[/#/, 'comment.php', '@phpLineComment'],
-			[/\/\//, 'comment.php', '@phpLineComment'],
+			[/(#|\/\/)$/, 'comment.php'],
+			[/(#|\/\/)/, 'comment.php', '@phpLineComment'],
 
 			// block comments
 			[/\/\*/, 'comment.php', '@phpComment'],