diff --git a/home/base/tui/editors/neovim/nvim/lua/plugins/orgmode.lua b/home/base/tui/editors/neovim/nvim/lua/plugins/orgmode.lua
index dfef0c4b..252d5082 100644
--- a/home/base/tui/editors/neovim/nvim/lua/plugins/orgmode.lua
+++ b/home/base/tui/editors/neovim/nvim/lua/plugins/orgmode.lua
@@ -1,26 +1,19 @@
 return {
-  "nvim-orgmode/orgmode",
-  dependencies = {
-    { "nvim-treesitter/nvim-treesitter", lazy = true },
-  },
-  event = "VeryLazy",
+  'nvim-orgmode/orgmode',
+  event = 'VeryLazy',
+  ft = { 'org' },
   config = function()
-    -- Load treesitter grammar for org
-    require("orgmode").setup_ts_grammar()
-
-    -- Setup treesitter
-    require("nvim-treesitter.configs").setup {
-      highlight = {
-        enable = true,
-        additional_vim_regex_highlighting = { "org" },
-      },
-      ensure_installed = { "org" },
-    }
-
     -- Setup orgmode
-    require("orgmode").setup {
+    require('orgmode').setup({
       org_agenda_files = "~/org/**/*",
       org_default_notes_file = "~/org/refile.org",
-    }
+    })
+
+    -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
+    -- add ~org~ to ignore_install
+    require('nvim-treesitter.configs').setup({
+      ensure_installed = 'all',
+      ignore_install = { 'org' },
+    })
   end,
 }