diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 1b2ea55..9ba420c 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,6 +1,7 @@
 " Vim plugin
 " Language: JavaScript
 " Maintainer: Ian Langworth <ian@langworth.com>
+" Credits: Ian Langworth, Zac Collier <zacacollier@gmail.com>
 
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
@@ -13,7 +14,7 @@ if exists('s:current_syntax')
 endif
 
 syntax region sqlTemplateString start=+`+ skip=+\\\(`\|$\)+ end=+`+ contains=@SQLSyntax,jsTemplateExpression,jsSpecial extend
-exec 'syntax match sqlTaggedTemplate +\%(SQL\)\%(`\)\@=+ nextgroup=sqlTemplateString'
+exec 'syntax match sqlTaggedTemplate +\%(sql|SQL\)\%(`\)\@=+ nextgroup=sqlTemplateString'
 
 hi def link sqlTemplateString jsTemplateString
 hi def link sqlTaggedTemplate jsTaggedTemplate
diff --git a/after/syntax/typescript/sql.vim b/after/syntax/typescript/sql.vim
new file mode 100644
index 0000000..ea22b75
--- /dev/null
+++ b/after/syntax/typescript/sql.vim
@@ -0,0 +1,23 @@
+" Vim plugin
+" Language: TypeScript
+" Maintainer: Ian Langworth <ian@langworth.com>
+" Credits: Ian Langworth, Zac Collier <zacacollier@gmail.com>
+
+if exists('b:current_syntax')
+  let s:current_syntax = b:current_syntax
+  unlet b:current_syntax
+endif
+
+exec 'syntax include @SQLSyntax syntax/' . g:typescript_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|SQL\)\%(`\)\@=+ nextgroup=sqlTemplateString'
+
+hi def link sqlTemplateString jsTemplateString
+hi def link sqlTaggedTemplate jsTaggedTemplate
+
+syn cluster jsExpression add=sqlTaggedTemplate
+syn cluster sqlTaggedTemplate add=sqlTemplateString
diff --git a/plugin/javascript-sql.vim b/plugin/javascript-sql.vim
index 640cda4..e0cf28f 100644
--- a/plugin/javascript-sql.vim
+++ b/plugin/javascript-sql.vim
@@ -6,3 +6,7 @@
 if (!exists('g:javascript_sql_dialect'))
   let g:javascript_sql_dialect = 'sql'
 endif
+
+if (!exists('g:typescript_sql_dialect'))
+  let g:typescript_sql_dialect = 'sql'
+endif