diff --git a/site-modules/core/files/emacs/src/lang/js-ts.el b/site-modules/core/files/emacs/src/lang/js-ts.el
index a11c9b8..3db2876 100644
--- a/site-modules/core/files/emacs/src/lang/js-ts.el
+++ b/site-modules/core/files/emacs/src/lang/js-ts.el
@@ -46,8 +46,11 @@
 
 (use-package typescript-mode
   :hook (typescript-mode . lsp-deferred)
-  :mode
-  (("\\.ts\\'"      . typescript-mode)
-   ("\\.tsx\\'"      . typescript-mode)))
+  :mode (("\\.ts\\'"      . typescript-mode)))
+
+(progn
+  (define-derived-mode typescript-tsx-mode web-mode "TypeScript-tsx")
+  (add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-tsx-mode))
+  (add-hook 'typescript-tsx-mode-hook 'lsp-deferred))
 
 (use-package prettier-js :commands prettier-js)
diff --git a/site-modules/core/files/emacs/src/lang/web.el b/site-modules/core/files/emacs/src/lang/web.el
index 8504de9..aea7b22 100644
--- a/site-modules/core/files/emacs/src/lang/web.el
+++ b/site-modules/core/files/emacs/src/lang/web.el
@@ -58,7 +58,7 @@
 	 (rjsx-mode     . (lambda ()
 			(emmet-mode)
 			(setq-local emmet-expand-jsx-className? t)))
-	 (typescript-mode . (lambda ()
+	 (typescript-tsx-mode . (lambda ()
 			(emmet-mode)
 			(setq-local emmet-expand-jsx-className? t)))))