diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 1b2ea55..304bf0f 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -8,14 +8,16 @@ if exists('b:current_syntax')
 endif
 
 exec 'syntax include @SQLSyntax syntax/' . g:javascript_sql_dialect . '.vim'
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
 syntax region sqlTemplateString start=+`+ skip=+\\\(`\|$\)+ end=+`+ contains=@SQLSyntax,jsTemplateExpression,jsSpecial extend
-exec 'syntax match sqlTaggedTemplate +\%(SQL\)\%(`\)\@=+ nextgroup=sqlTemplateString'
 
-hi def link sqlTemplateString jsTemplateString
+exec 'syntax match sqlTaggedTemplate +\<sql\>\s*\ze`+ nextgroup=sqlTemplateString'
+exec 'syntax match sqlTaggedTemplate +\/\*\s*sql\s*\*\/\s*\ze`+ nextgroup=sqlTemplateString'
+
 hi def link sqlTaggedTemplate jsTaggedTemplate
 
 syn cluster jsExpression add=sqlTaggedTemplate