diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index ff4ae62..bbee957 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -584,6 +584,7 @@ simply return the content of \begin{document}...\end{document},
 without even the \begin{document} and \end{document} commands.
 when PUB-DIR is set, use this as the publishing directory."
   (interactive "P")
+  (when (and (not body-only) (listp arg)) (setq body-only t))
   (run-hooks 'org-export-first-hook)
 
   ;; Make sure we have a file name when we need it.