diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 2211abc50..afb4400a7 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -73,5 +73,10 @@ If set to `nil', disable all the above behaviors.")
                less-css-mode-local-vars-hook)
              :append #'lsp!))
 
-(when (modulep! +tree-sitter)
-  (add-hook 'css-mode-local-vars-hook #'tree-sitter! 'append))
+
+(use-package! css-ts-mode
+  :when (modulep! +tree-sitter)
+  :when (fboundp 'css-ts-mode) ; 29.1+ only
+  :defer t
+  :init
+  (set-tree-sitter! 'css-mode 'css-ts-mode 'css))
diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el
index e9abf0227..00417a42d 100644
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@@ -167,7 +167,18 @@
                nxml-mode-local-vars-hook)
              :append #'lsp!))
 
-(when (modulep! +tree-sitter)
-  (add-hook! '(html-mode-local-vars-hook
-               mhtml-mode-local-vars-hook)
-             :append #'tree-sitter!))
+
+(use-package! html-ts-mode
+  :when (modulep! +tree-sitter)
+  :when (fboundp 'html-ts-mode) ; 30.1+ only
+  :defer t
+  :init
+  (set-tree-sitter! 'html-mode 'html-ts-mode 'html))
+
+
+(use-package! mhtml-ts-mode
+  :when (modulep! +tree-sitter)
+  :when (fboundp 'mhtml-ts-mode) ; 31+ only
+  :defer t
+  :init
+  (set-tree-sitter! 'mhtml-mode 'mhtml-ts-mode 'html))