diff --git a/lisp/magit-tag.el b/lisp/magit-tag.el
index 928c7ff36c..769500a281 100644
--- a/lisp/magit-tag.el
+++ b/lisp/magit-tag.el
@@ -192,7 +192,9 @@ like \"/path/to/foo-bar\"."
                     (match-string 2 tag)))
           (args (magit-tag-arguments)))
        (list tag
-             (and (member "--annotate" args)
+             (and (or (member "--annotate" args)
+                      (member "--sign" args)
+                      (seq-some (lambda (x) (string-prefix-p "--local-user" x)) args))
                   (read-string
                    (format "Message for %S: " tag)
                    (cond ((and pver (string-match (regexp-quote pver) pmsg))