diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 78aaab8c3..0f02e70e2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1083,7 +1083,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '413dba9fea354b62f6adada1815b2f504e32ffb5',
+      revision = 'c213d3745ccdcaaa858869181c7b1bf9557a025f',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1094,7 +1094,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '413dba9fea354b62f6adada1815b2f504e32ffb5',
+      revision = 'c213d3745ccdcaaa858869181c7b1bf9557a025f',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index fd2030fa8..9829e75ea 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -49,14 +49,15 @@
 ] @keyword
 
 [
-  "endtrans"
-  "endblock"
-  "endwith"
-  "endfilter"
-  "endmacro"
-  "endcall"
-  "endset"
-  "endautoescape"
+  (endtrans_statement)
+  (endblock_statement)
+  (endwith_statement)
+  (endfilter_statement)
+  (endmacro_statement)
+  (endcall_statement)
+  (endset_statement)
+  (endautoescape_statement)
+  "required"
 ] @keyword
 
 (do_statement
@@ -74,9 +75,9 @@
 
 [
   "if"
-  "else"
-  "endif"
-  "elif"
+  (else_statement)
+  (endif_statement)
+  (elif_block)
 ] @keyword.conditional
 
 [
@@ -84,7 +85,7 @@
   "in"
   "continue"
   "break"
-  "endfor"
+  (endfor_statement)
 ] @keyword.repeat
 
 "call" @function.call