diff --git a/neovim/default.nix b/neovim/default.nix
index ffb1b68..5eaa807 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -21,6 +21,14 @@
         self.nixvimModules.config
         self.nixvimModules.plugins
         self.nixvimModules.modules
+        {
+          nixpkgs.overlays = [
+            (final: prev: {
+              # Wait for staging tree-sitter upgrade to avoid freezes
+              inherit (inputs.nixpkgs-ts.legacyPackages.${prev.system}) tree-sitter;
+            })
+          ];
+        }
       ];
     };
   };