diff --git a/lua/lazyvim/plugins/treesitter.lua b/lua/lazyvim/plugins/treesitter.lua
index 753cfb7d..ed8bf964 100644
--- a/lua/lazyvim/plugins/treesitter.lua
+++ b/lua/lazyvim/plugins/treesitter.lua
@@ -11,16 +11,26 @@ return {
       {
         "nvim-treesitter/nvim-treesitter-textobjects",
         config = function()
-          -- Disable class keymaps in diff mode
-          vim.api.nvim_create_autocmd("BufReadPost", {
-            callback = function(event)
-              if vim.wo.diff then
-                for _, key in ipairs({ "[c", "]c", "[C", "]C" }) do
-                  pcall(vim.keymap.del, "n", key, { buffer = event.buf })
+          -- When in diff mode, we want to use the default
+          -- vim text objects c & C instead of the treesitter ones.
+          local move = require("nvim-treesitter.textobjects.move") ---@type table<string,fun(...)>
+          local configs = require("nvim-treesitter.configs")
+          for name, fn in pairs(move) do
+            if name:find("goto") == 1 then
+              move[name] = function(q, ...)
+                if vim.wo.diff then
+                  local config = configs.get_module("textobjects.move")[name] ---@type table<string,string>
+                  for key, query in pairs(config or {}) do
+                    if q == query and key:find("[%]%[][cC]") then
+                      vim.cmd("normal! " .. key)
+                      return
+                    end
+                  end
                 end
+                return fn(q, ...)
               end
-            end,
-          })
+            end
+          end
         end,
       },
     },