diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua
index 2b2810a..7292d0c 100644
--- a/lua/taken/plugins/lsp/lspconfig.lua
+++ b/lua/taken/plugins/lsp/lspconfig.lua
@@ -30,6 +30,17 @@ return {
             })
         end
 
+        lspconfig["eslint"].setup({
+            capabilities = capabilities,
+            on_attach = function(client, bufnr)
+                on_attach(client, bufnr)
+                vim.api.nvim_create_autocmd("BufWritePre", {
+                    buffer = bufnr,
+                    command = "EslintFixAll",
+                })
+            end,
+        })
+
         lspconfig["lua_ls"].setup({
             capabilities = capabilities,
             on_attach = on_attach,
diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua
index 0a8f230..0bdd0c5 100644
--- a/lua/taken/plugins/lsp/mason.lua
+++ b/lua/taken/plugins/lsp/mason.lua
@@ -23,6 +23,7 @@ return {
                 "pyright",
                 "powershell_es",
                 "jsonls",
+                "eslint"
             },
             automatic_installation = true,
         })
@@ -30,7 +31,6 @@ return {
         mason_null_ls.setup({
             ensure_installed = {
                 "stylua",
-                "eslint_d",
             },
             automatic_installation = true,
         })
diff --git a/lua/taken/plugins/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua
index 27b7292..2e8d8ad 100644
--- a/lua/taken/plugins/lsp/null-ls.lua
+++ b/lua/taken/plugins/lsp/null-ls.lua
@@ -12,11 +12,6 @@ return {
         null_ls.setup({
             sources = {
                 formatting.stylua,
-                diagnostics.eslint_d.with({
-                    condition = function(utils)
-                        return utils.root_has_file({ ".eslintrc.js" })
-                    end,
-                }),
             },
 
             on_attach = function(client, bufnr)