diff --git a/nvim/lua/conf/lspconfig/init.lua b/nvim/lua/conf/lspconfig/init.lua
index 773d0d2f..80ebddbf 100644
--- a/nvim/lua/conf/lspconfig/init.lua
+++ b/nvim/lua/conf/lspconfig/init.lua
@@ -1,6 +1,14 @@
 local lspconfig = require 'lspconfig'
 lspconfig.bashls.setup { filetypes = { "sh" } }
 lspconfig.docker_compose_language_service.setup {}
+lspconfig.eslint.setup({
+  on_attach = function(client, bufnr)
+    vim.api.nvim_create_autocmd("BufWritePre", {
+      buffer = bufnr,
+      command = "EslintFixAll",
+    })
+  end,
+})
 lspconfig.lua_ls.setup {
     settings = {
         Lua = {
diff --git a/nvim/lua/conf/mason/init.lua b/nvim/lua/conf/mason/init.lua
index 0c7d650f..a8555e11 100644
--- a/nvim/lua/conf/mason/init.lua
+++ b/nvim/lua/conf/mason/init.lua
@@ -3,6 +3,7 @@ require("mason-lspconfig").setup {
     ensure_installed = {
         "bashls",
         "docker_compose_language_service",
+        "eslint",
         "golangci_lint_ls",
         "gopls",
         "lua_ls",
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index bd253760..6f17c34e 100755
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -175,7 +175,6 @@ local null_ls = require("null-ls")
 
 null_ls.setup({
     sources = {
-        null_ls.builtins.formatting.eslint,
         null_ls.builtins.formatting.goimports,
         null_ls.builtins.formatting.gofumpt,
         null_ls.builtins.formatting.prettier,