diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 84f132e48..7236c84de 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -105,24 +105,19 @@
   (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ; quote
-"'" @string.escape
-
 (format_specifier) @string.escape
 
-(quoting_lit) @string.escape
+(quoting_lit
+  "'" @string.escape)
 
-; syntax quote
-"`" @string.escape
+(syn_quoting_lit
+  "`" @string.escape)
 
-"," @string.escape
+(unquoting_lit
+  "," @string.escape)
 
-",@" @string.escape
-
-(syn_quoting_lit) @string.escape
-
-(unquoting_lit) @none
-
-(unquote_splicing_lit) @none
+(unquote_splicing_lit
+  ",@" @string.escape)
 
 [
   "("