diff --git a/lockfile.json b/lockfile.json
index f3f92b5c5..c37211fd2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -252,7 +252,7 @@
     "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
   },
   "javascript": {
-    "revision": "5720b249490b3c17245ba772f6be4a43edb4e3b7"
+    "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -528,7 +528,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
+    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -537,7 +537,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
+    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 1f19c6b2a..718add87f 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -1,9 +1,8 @@
 (jsx_element
   open_tag: (jsx_opening_element ["<" ">"] @tag.delimiter))
 (jsx_element
-  close_tag: (jsx_closing_element ["<" "/" ">"] @tag.delimiter))
-(jsx_self_closing_element ["/" ">" "<"] @tag.delimiter)
-(jsx_fragment [">" "<" "/"] @tag.delimiter)
+  close_tag: (jsx_closing_element ["</" ">"] @tag.delimiter))
+(jsx_self_closing_element ["<" "/>"] @tag.delimiter)
 (jsx_attribute (property_identifier) @tag.attribute)
 
 (jsx_opening_element
@@ -19,18 +18,18 @@
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_opening_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_closing_element ((identifier) @constructor
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_self_closing_element ((identifier) @constructor
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_self_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_text) @none
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
index 3355061e1..c0dd53281 100644
--- a/queries/jsx/indents.scm
+++ b/queries/jsx/indents.scm
@@ -1,16 +1,11 @@
 [
-  (jsx_fragment)
   (jsx_element)
   (jsx_self_closing_element)
   (jsx_expression)
 ] @indent.begin
 
-(jsx_fragment
-  ("<" ">" (_) "<" @indent.branch "/" ">" @indent.end)
-)
-
 (jsx_closing_element (">" @indent.end))
-(jsx_self_closing_element ">" @indent.end)
+(jsx_self_closing_element "/>" @indent.end)
 
 [
   (jsx_closing_element)
@@ -18,4 +13,4 @@
 ] @indent.branch
 ; <button
 ; />
-(jsx_self_closing_element "/" @indent.branch)
+(jsx_self_closing_element "/>" @indent.branch)