diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 2e11ca4..438e5a4 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -871,6 +871,7 @@ when PUB-DIR is set, use this as the publishing directory."
 		 filename)))
 	 (auto-insert nil); Avoid any auto-insert stuff for the new file
 	 (TeX-master (boundp 'TeX-master))
+	 (dummy (unless TeX-master (makunbound 'TeX-master))) ; make sure we are not introducing TeX-master
 	 (buffer (if to-buffer
 		     (cond
 		      ((eq to-buffer 'string) (get-buffer-create