diff --git a/lisp/treesit.el b/lisp/treesit.el
index a85eb699ee1..374c17c0894 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1546,6 +1546,10 @@ RULES."
                   (pcase func
                     (`(query ,qry)
                      (list 'query (treesit-query-compile lang qry)))
+                    (`(and . ,fns)
+                     (cons 'and (mapcar #'optimize-func fns)))
+                    (`(or . ,fns)
+                     (cons 'or (mapcar #'optimize-func fns)))
                     (_ func)))
                 ;; Optimize a rule (MATCHER ANCHOR OFFSET).
                 (optimize-rule (rule)