diff --git a/lua/plex/plugins/treesitter.lua b/lua/plex/plugins/treesitter.lua
index 592534c..ff6f3d1 100644
--- a/lua/plex/plugins/treesitter.lua
+++ b/lua/plex/plugins/treesitter.lua
@@ -89,7 +89,14 @@ return {
 			},
 
 			-- See: https://github.com/JoosepAlviste/nvim-ts-context-commentstring
-			context_commentstring = { enable = true, enable_autocmd = false },
+			--context_commentstring = { enable = true, enable_autocmd = false },
+
+			-- context_commentstring nvim-treesitter module is deprecated, use
+			-- require('ts_context_commentstring').setup {} and set
+			-- vim.g.skip_ts_context_commentstring_module = true to speed up loading instead.
+			-- This feature will be removed in ts_context_commentstring version in the future
+
+
 
 			incremental_selection = {
 				enable = true,
@@ -189,6 +196,8 @@ return {
 		init = function ()
 			vim.opt.concealcursor = "nc"
 			vim.opt.conceallevel = 2
+			vim.g.skip_ts_context_commentstring_module = true
+			require('ts_context_commentstring').setup {}
 		end
 	},
 }