diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 93235bd9ece..5b1786af512 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -254,7 +254,9 @@ the current %s and exit."
     ;; Clear the last prompt from the minibuffer, and restore the
     ;; previous echo-area message, if any.
     (let ((message-log-max nil))
-      (message (or msg "")))
+      (if msg
+          (message "%s" msg)
+        (message "")))
     ;; Return the number of actions that were taken.
     actions))