diff --git a/crates/languages/src/javascript/config.toml b/crates/languages/src/javascript/config.toml
index bbfec1213b..460ee0e0fd 100644
--- a/crates/languages/src/javascript/config.toml
+++ b/crates/languages/src/javascript/config.toml
@@ -16,12 +16,13 @@ brackets = [
 ]
 word_characters = ["$", "#"]
 tab_size = 2
-scope_opt_in_language_servers = ["tailwindcss-language-server"]
+scope_opt_in_language_servers = ["tailwindcss-language-server", "emmet-language-server"]
 prettier_parser_name = "babel"
 
 [overrides.element]
 line_comments = { remove = true }
 block_comment = ["{/* ", " */}"]
+opt_into_language_servers = ["emmet-language-server"]
 
 [overrides.string]
 word_characters = ["-"]
diff --git a/crates/languages/src/tsx/config.toml b/crates/languages/src/tsx/config.toml
index 044fc15d81..3cd377ce0b 100644
--- a/crates/languages/src/tsx/config.toml
+++ b/crates/languages/src/tsx/config.toml
@@ -14,13 +14,14 @@ brackets = [
     { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
 ]
 word_characters = ["#", "$"]
-scope_opt_in_language_servers = ["tailwindcss-language-server"]
+scope_opt_in_language_servers = ["tailwindcss-language-server", "emmet-language-server"]
 prettier_parser_name = "typescript"
 tab_size = 2
 
 [overrides.element]
 line_comments = { remove = true }
 block_comment = ["{/* ", " */}"]
+opt_into_language_servers = ["emmet-language-server"]
 
 [overrides.string]
 word_characters = ["-"]
diff --git a/extensions/emmet/extension.toml b/extensions/emmet/extension.toml
index 7c0a63ef31..d42579607a 100644
--- a/extensions/emmet/extension.toml
+++ b/extensions/emmet/extension.toml
@@ -9,4 +9,12 @@ repository = "https://github.com/zed-industries/zed"
 [language_servers.emmet-language-server]
 name = "Emmet Language Server"
 language = "HTML"
-languages = ["HTML", "PHP", "ERB"]
+languages = ["HTML", "PHP", "ERB", "JavaScript", "TSX", "CSS"]
+
+[language_servers.emmet-language-server.language_ids]
+"HTML" = "html"
+"PHP" = "php"
+"ERB" = "eruby"
+"JavaScript" = "javascriptreact"
+"TSX" = "typescriptreact"
+"CSS" = "css"