diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 64f49f8f6..f62e88c5d 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -232,9 +232,12 @@
 
 "return" @keyword.return
 
-(comment) @comment @spell
+[
+  (comment)
+  (block_comment)
+] @comment @spell
 
-((comment) @comment.documentation
+((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 ;; `case` is a conditional keyword in case_block
diff --git a/queries/scala/injections.scm b/queries/scala/injections.scm
index 4bb7d675d..521ca7a67 100644
--- a/queries/scala/injections.scm
+++ b/queries/scala/injections.scm
@@ -1 +1,4 @@
-(comment) @comment
+[
+  (comment) 
+  (block_comment)
+] @comment