diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua
index 0ba2182..b76fa22 100644
--- a/lua/taken/plugins/lsp/mason.lua
+++ b/lua/taken/plugins/lsp/mason.lua
@@ -30,6 +30,7 @@ return {
             ensure_installed = {
                 "stylua",
                 "clang-format",
+                "eslint_d",
             },
             automatic_installation = true,
         })
diff --git a/lua/taken/plugins/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua
index 50b24aa..d0fee34 100644
--- a/lua/taken/plugins/lsp/null-ls.lua
+++ b/lua/taken/plugins/lsp/null-ls.lua
@@ -13,6 +13,11 @@ return {
             sources = {
                 formatting.stylua,
                 formatting.clang_format,
+                diagnostics.eslint_d.with({
+                    condition = function(utils)
+                        return utils.root_has_file({ ".eslintrc.js", ".eslintrc.cjs" }) -- only enable if root has .eslintrc.js or .eslintrc.cjs
+                    end,
+                }),
             },
 
             on_attach = function(client, bufnr)