diff --git a/components/prism-json.js b/components/prism-json.js
index 8f9ae4a517..07c4ea5dac 100644
--- a/components/prism-json.js
+++ b/components/prism-json.js
@@ -8,7 +8,10 @@ Prism.languages.json = {
 		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
 		greedy: true
 	},
-	'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
+	'comment': {
+		pattern: /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
+		greedy: true
+	},
 	'number': /-?\b\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,
 	'punctuation': /[{}[\],]/,
 	'operator': /:/,
diff --git a/components/prism-json.min.js b/components/prism-json.min.js
index fd102bf591..8315a59a24 100644
--- a/components/prism-json.min.js
+++ b/components/prism-json.min.js
@@ -1 +1 @@
-Prism.languages.json={property:{pattern:/"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,greedy:!0},string:{pattern:/"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,greedy:!0},comment:/\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,number:/-?\b\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,punctuation:/[{}[\],]/,operator:/:/,boolean:/\b(?:true|false)\b/,null:{pattern:/\bnull\b/,alias:"keyword"}},Prism.languages.webmanifest=Prism.languages.json;
\ No newline at end of file
+Prism.languages.json={property:{pattern:/"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,greedy:!0},string:{pattern:/"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,greedy:!0},comment:{pattern:/\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,greedy:!0},number:/-?\b\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,punctuation:/[{}[\],]/,operator:/:/,boolean:/\b(?:true|false)\b/,null:{pattern:/\bnull\b/,alias:"keyword"}},Prism.languages.webmanifest=Prism.languages.json;
\ No newline at end of file
diff --git a/tests/languages/json/comment_feature.test b/tests/languages/json/comment_feature.test
index 50341d3992..3205c750a7 100644
--- a/tests/languages/json/comment_feature.test
+++ b/tests/languages/json/comment_feature.test
@@ -1,5 +1,5 @@
 {
-	// Line comment
+	// Line comment ""
 	"//": "//",
 
 	/* Block comment */
@@ -10,7 +10,7 @@
 
 [
 	["punctuation", "{"],
-	["comment", "// Line comment"],
+	["comment", "// Line comment \"\""],
 	["property", "\"//\""],
 	["operator", ":"],
 	["string", "\"//\""],