diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a873e5f9747..44226449af2 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2388,9 +2388,11 @@ These include:
           ;; If there are no completions, or if the current input is already
           ;; the sole completion, then hide (previous&stale) completions.
           (minibuffer-hide-completions)
-          (ding)
-          (completion--message
-           (if completions "Sole completion" "No completions")))
+          (if completions
+              (completion--message "Sole completion")
+            (unless completion-fail-discreetly
+	      (ding)
+	      (completion--message "No match"))))
 
       (let* ((last (last completions))
              (base-size (or (cdr last) 0))