diff --git a/ftplugin/javascript.lua b/ftplugin/javascript.lua
deleted file mode 100644
index 427ac886..00000000
--- a/ftplugin/javascript.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("typescript-tools.user_commands").setup_user_commands()
diff --git a/ftplugin/javascriptreact.lua b/ftplugin/javascriptreact.lua
deleted file mode 100644
index 427ac886..00000000
--- a/ftplugin/javascriptreact.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("typescript-tools.user_commands").setup_user_commands()
diff --git a/ftplugin/typescript.lua b/ftplugin/typescript.lua
deleted file mode 100644
index 427ac886..00000000
--- a/ftplugin/typescript.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("typescript-tools.user_commands").setup_user_commands()
diff --git a/ftplugin/typescriptreact.lua b/ftplugin/typescriptreact.lua
deleted file mode 100644
index 427ac886..00000000
--- a/ftplugin/typescriptreact.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("typescript-tools.user_commands").setup_user_commands()
diff --git a/lua/typescript-tools/autocommands/init.lua b/lua/typescript-tools/autocommands/init.lua
index 4c2ce5bb..618fab44 100644
--- a/lua/typescript-tools/autocommands/init.lua
+++ b/lua/typescript-tools/autocommands/init.lua
@@ -2,6 +2,7 @@ local diagnostics = require "typescript-tools.autocommands.diagnostics"
 local code_lens = require "typescript-tools.autocommands.code_lens"
 local config = require "typescript-tools.config"
 local jsx_close_tag = require "typescript-tools.autocommands.jsx_close_tag"
+local user_commands = require "typescript-tools.autocommands.user_commands"
 
 local M = {}
 
@@ -16,6 +17,8 @@ function M.setup_autocommands(dispatchers)
   if config.jsx_close_tag.enable then
     jsx_close_tag.setup_jsx_close_tag_autocmds()
   end
+
+  user_commands.autosetup_user_commands()
 end
 
 return M
diff --git a/lua/typescript-tools/autocommands/user_commands.lua b/lua/typescript-tools/autocommands/user_commands.lua
new file mode 100644
index 00000000..bf4cf3fc
--- /dev/null
+++ b/lua/typescript-tools/autocommands/user_commands.lua
@@ -0,0 +1,14 @@
+local api = vim.api
+local common = require "typescript-tools.autocommands.common"
+
+local M = {}
+
+function M.autosetup_user_commands()
+  local augroup = api.nvim_create_augroup("TypescriptToolsUserCommandsGroup", { clear = true })
+
+  common.create_lsp_attach_augcmd(function()
+    require("typescript-tools.user_commands").setup_user_commands()
+  end, augroup)
+end
+
+return M