diff --git a/neovim/.config/nvim/after/plugin/treesitter.lua b/neovim/.config/nvim/after/plugin/treesitter.lua
index 7bcb100..b2e8944 100644
--- a/neovim/.config/nvim/after/plugin/treesitter.lua
+++ b/neovim/.config/nvim/after/plugin/treesitter.lua
@@ -32,9 +32,6 @@ require("nvim-treesitter.configs").setup({
   highlight = {
     enable = true,
   },
-  context_commentstring = {
-    enable = true,
-  },
   autotag = {
     enable = true,
   },
diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index a9775f0..336fd4e 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -18,7 +18,13 @@ require("packer").startup(function(use)
   use({ "sainnhe/gruvbox-material" })
 
   use({ "nvim-treesitter/nvim-treesitter" })
-  use({ "JoosepAlviste/nvim-ts-context-commentstring" })
+  use({
+    "JoosepAlviste/nvim-ts-context-commentstring",
+    config = function()
+      require("ts_context_commentstring").setup({})
+      vim.g.skip_ts_context_commentstring_module = true
+    end,
+  })
 
   use({
     "nvim-telescope/telescope.nvim",