diff --git a/modules/tools/tree-sitter/config.el b/modules/tools/tree-sitter/config.el
index b44dce01c..819ccc379 100644
--- a/modules/tools/tree-sitter/config.el
+++ b/modules/tools/tree-sitter/config.el
@@ -21,12 +21,13 @@
                                (error-message-string e))
          (signal (car e) (cadr e)))))))
 
-(use-package! evil-textobj-tree-sitter
-  :after tree-sitter
-  :config
-  (map!
-   :textobj "f" (evil-textobj-tree-sitter-get-textobj "function.inner") (evil-textobj-tree-sitter-get-textobj "function.outer") ;; redef
-   :textobj "C" (evil-textobj-tree-sitter-get-textobj "class.inner") (evil-textobj-tree-sitter-get-textobj "class.outer")
-   :textobj "c" nil (evil-textobj-tree-sitter-get-textobj "comment.outer")
-   :textobj "i" (evil-textobj-tree-sitter-get-textobj "conditional.inner") (evil-textobj-tree-sitter-get-textobj "conditional.outer")
-   :textobj "l" (evil-textobj-tree-sitter-get-textobj "loop.inner") (evil-textobj-tree-sitter-get-textobj "loop.outer")))
+(when (featurep! :editor evil +everywhere)
+  (use-package! evil-textobj-tree-sitter
+    :after tree-sitter
+    :config
+    (map!
+     :textobj "f" (evil-textobj-tree-sitter-get-textobj "function.inner") (evil-textobj-tree-sitter-get-textobj "function.outer") ;; redef
+     :textobj "C" (evil-textobj-tree-sitter-get-textobj "class.inner") (evil-textobj-tree-sitter-get-textobj "class.outer")
+     :textobj "c" nil (evil-textobj-tree-sitter-get-textobj "comment.outer")
+     :textobj "i" (evil-textobj-tree-sitter-get-textobj "conditional.inner") (evil-textobj-tree-sitter-get-textobj "conditional.outer")
+     :textobj "l" (evil-textobj-tree-sitter-get-textobj "loop.inner") (evil-textobj-tree-sitter-get-textobj "loop.outer"))))
diff --git a/modules/tools/tree-sitter/packages.el b/modules/tools/tree-sitter/packages.el
index 6b4295419..d467db603 100644
--- a/modules/tools/tree-sitter/packages.el
+++ b/modules/tools/tree-sitter/packages.el
@@ -2,10 +2,8 @@
 ;;; tools/tree-sitter/packages.el
 
 (package! tree-sitter
-  ;; :ignore (null (bound-and-true-p module-file-suffix))
   :pin "c7a1c34549cad41a3618c6f17e0e9dabd3e98fe1")
 (package! tree-sitter-langs
-  ;; :ignore (null (bound-and-true-p module-file-suffix))
   :pin "e7b8db7c4006c04a4bc1fc6865ec31f223843192")
 
 (when (featurep! :editor evil +everywhere)