diff --git a/modules/lang/javascript/packages.el b/modules/lang/javascript/packages.el
index 5a61a437a..d64255af2 100644
--- a/modules/lang/javascript/packages.el
+++ b/modules/lang/javascript/packages.el
@@ -2,9 +2,7 @@
 ;;; lang/javascript/packages.el
 
 ;; Major modes
-(unless (or (modulep! +tree-sitter)
-            (fboundp 'treesit-available-p)
-            (treesit-available-p))
+(unless (modulep! +tree-sitter)
   (package! typescript-mode :pin "481df3ad2cdf569d8e6697679669ff6206fbd2f9"))
 
 ;; Extensions
diff --git a/modules/tools/tree-sitter/config.el b/modules/tools/tree-sitter/config.el
index d45aa88c9..8203147d0 100644
--- a/modules/tools/tree-sitter/config.el
+++ b/modules/tools/tree-sitter/config.el
@@ -60,7 +60,12 @@
                         (or (not (autoloadp fn))
                             (autoload-do-load fn mode)))
                       ;; Only prompt once, and log other times.
-                      (or (null (cdr ts))
+                      (or (null (cdr ts))  ; no grammars, no problem!
+                          ;; If the base/fallback mode doesn't exist, let's
+                          ;; assume we want no fallthrough for this major mode
+                          ;; and push forward anyway, even if a missing grammar
+                          ;; results in a broken state.
+                          (not (fboundp fallback-mode))
                           (cl-every (if (get mode '+tree-sitter-ensured)
                                         (doom-rpartial #'treesit-ready-p 'message)
                                       #'treesit-ensure-installed)