diff --git a/lua/aceforeverd/config/treesitter.lua b/lua/aceforeverd/config/treesitter.lua
index 7e19e34..8672c76 100644
--- a/lua/aceforeverd/config/treesitter.lua
+++ b/lua/aceforeverd/config/treesitter.lua
@@ -191,7 +191,6 @@ function M.setup()
     endwise = {
       enable = true,
     },
-    context_commentstring = { enable = true, enable_autocmd = false },
     autotag = {
       enable = true,
     },
@@ -199,12 +198,6 @@ function M.setup()
 
   -- :set foldmethod=expr to enable fold with expr, default is manual
   vim.cmd([[set foldexpr=nvim_treesitter#foldexpr()]])
-  require('aceforeverd.util.map').set_map(
-    'n',
-    '<leader>uc',
-    ":lua require('ts_context_commentstring.internal').update_commentstring()<CR>",
-    { silent = true, noremap = true }
-  )
 end
 
 return M
diff --git a/lua/aceforeverd/plugins/init.lua b/lua/aceforeverd/plugins/init.lua
index 6803566..0003462 100644
--- a/lua/aceforeverd/plugins/init.lua
+++ b/lua/aceforeverd/plugins/init.lua
@@ -448,7 +448,6 @@ M.plugin_list = {
       'nvim-treesitter/nvim-treesitter-refactor',
       'RRethy/nvim-treesitter-textsubjects',
       'RRethy/nvim-treesitter-endwise',
-      'JoosepAlviste/nvim-ts-context-commentstring',
       'windwp/nvim-ts-autotag',
     },
     build = ':TSUpdate',
@@ -456,6 +455,20 @@ M.plugin_list = {
       require('aceforeverd.config').treesitter()
     end,
   },
+  {
+    'JoosepAlviste/nvim-ts-context-commentstring',
+    config = function()
+      require('ts_context_commentstring').setup({
+        enable_autocmd = false,
+      })
+      vim.keymap.set(
+        'n',
+        '<leader>uc',
+        function() require('ts_context_commentstring.internal').update_commentstring() end,
+        { silent = true, noremap = true, desc = 'update commentstring' }
+      )
+    end
+  },
 
   {
     'HiPhish/rainbow-delimiters.nvim',