diff --git a/modules/lang/erlang/config.el b/modules/lang/erlang/config.el
index bf03df4a7..a16a6c4d5 100644
--- a/modules/lang/erlang/config.el
+++ b/modules/lang/erlang/config.el
@@ -13,7 +13,6 @@
 
 (use-package! erlang-ts
   :when (modulep! +tree-sitter)
-  :when (fboundp 'erlang-ts-mode)
   :defer t
   :init
   (set-tree-sitter! 'erlang-mode 'erlang-ts-mode
diff --git a/modules/lang/graphql/config.el b/modules/lang/graphql/config.el
index a25db1232..bd69a2701 100644
--- a/modules/lang/graphql/config.el
+++ b/modules/lang/graphql/config.el
@@ -33,7 +33,6 @@
 
 (use-package! graphql-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'graphql-mode 'graphql-ts-mode
diff --git a/modules/lang/haskell/config.el b/modules/lang/haskell/config.el
index 3707ac6a9..567ccf1f0 100644
--- a/modules/lang/haskell/config.el
+++ b/modules/lang/haskell/config.el
@@ -46,7 +46,6 @@
 
 (use-package! haskell-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'haskell-ts-mode)
   :defer t
   :init
   (set-tree-sitter! 'haskell-mode 'haskell-ts-mode
diff --git a/modules/lang/kotlin/config.el b/modules/lang/kotlin/config.el
index 06a6a34bb..feaf87719 100644
--- a/modules/lang/kotlin/config.el
+++ b/modules/lang/kotlin/config.el
@@ -22,7 +22,6 @@
 
 (use-package! kotlin-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'kotlin-mode 'kotlin-ts-mode
diff --git a/modules/lang/nix/config.el b/modules/lang/nix/config.el
index 035e5f418..e056952b4 100644
--- a/modules/lang/nix/config.el
+++ b/modules/lang/nix/config.el
@@ -44,7 +44,6 @@
 
 (use-package! nix-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'nix-mode 'nix-ts-mode
diff --git a/modules/lang/qt/config.el b/modules/lang/qt/config.el
index afcd94357..18ad22831 100644
--- a/modules/lang/qt/config.el
+++ b/modules/lang/qt/config.el
@@ -14,7 +14,6 @@
 
 (use-package! qml-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'qml-mode 'qml-ts-mode
diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el
index 6197fe243..e6273225f 100644
--- a/modules/lang/scala/config.el
+++ b/modules/lang/scala/config.el
@@ -57,7 +57,6 @@
 
 (use-package! scala-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'scala-mode 'scala-ts-mode
diff --git a/modules/lang/sml/config.el b/modules/lang/sml/config.el
index 81493bfcc..382973d4c 100644
--- a/modules/lang/sml/config.el
+++ b/modules/lang/sml/config.el
@@ -29,7 +29,6 @@
 ;; TODO: Mirror sml-mode keybinds to ts-mode
 (use-package! sml-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'treesit-available-p)
   :defer t
   :init
   (set-tree-sitter! 'sml-mode 'sml-ts-mode
diff --git a/modules/lang/zig/config.el b/modules/lang/zig/config.el
index e397a8b9b..393c59a3c 100644
--- a/modules/lang/zig/config.el
+++ b/modules/lang/zig/config.el
@@ -40,7 +40,6 @@
 
 (use-package! zig-ts-mode
   :when (modulep! +tree-sitter)
-  :when (fboundp 'zig-ts-mode)
   :defer t
   :init
   ;; REVIEW: maxxnino/tree-sitter-zig is unmaintained; waiting for alternatives.
diff --git a/modules/tools/tree-sitter/config.el b/modules/tools/tree-sitter/config.el
index 8203147d0..0de302d84 100644
--- a/modules/tools/tree-sitter/config.el
+++ b/modules/tools/tree-sitter/config.el
@@ -44,7 +44,11 @@
     (let ((mode (funcall fn mode)))
       (if-let* ((ts (get mode '+tree-sitter))
                 (fallback-mode (car ts)))
-          (cond ((not (fboundp mode))
+          (cond ((or (not (fboundp 'treesit-available-p))
+                     (not (treesit-available-p)))
+                 (message "Treesit unavailable, falling back to `%S'" fallback-mode)
+                 fallback-mode)
+                ((not (fboundp mode))
                  (message "Couldn't find `%S', falling back to `%S'" mode fallback-mode)
                  fallback-mode)
                 ((and (or (eq treesit-enabled-modes t)