diff --git a/lisp/ob.el b/lisp/ob.el
index 43a0c76cb..1128915c8 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -180,10 +180,10 @@ of potentially harmful code."
   (let* ((eval (or (cdr (assoc :eval (nth 2 info)))
 		   (when (assoc :noeval (nth 2 info)) "no")))
 	 (query (or (equal eval "query")
-		    (and (functionp org-confirm-babel-evaluate)
-			 (funcall org-confirm-babel-evaluate
-				  (nth 0 info) (nth 1 info)))
-		    org-confirm-babel-evaluate)))
+		    (if (functionp org-confirm-babel-evaluate)
+			(funcall org-confirm-babel-evaluate
+				 (nth 0 info) (nth 1 info))
+		      org-confirm-babel-evaluate))))
     (if (or (equal eval "never") (equal eval "no")
 	    (and query
 		 (not (yes-or-no-p