diff --git a/org-ql.el b/org-ql.el
index 4808ca8..02abc84 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -1296,7 +1296,7 @@ result form."
        ,@(mapcar #'org-ql-normalize-query clauses))))
   :preambles
   ((`(when ,condition . ,clauses)
-    (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble `(and ,condition ,(last clauses)))))
+    (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble `(and ,condition ,(car (last clauses))))))
       (list :regexp regexp
             :case-fold case-fold
             :query `(when ,condition ,@clauses))))))
@@ -1309,7 +1309,7 @@ result form."
        ,@(mapcar #'org-ql-normalize-query clauses))))
   :preambles
   ((`(unless ,condition . ,clauses)
-    (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble ,(last clauses))))
+    (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble (car (last clauses)))))
       (list :regexp regexp
             :case-fold case-fold
             :query `(unless ,condition ,@clauses))))))