--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
@@ -126,7 +126,7 @@
         }
 
         if (!msgOptionSeen) {
-            doclintOpts.add(DocLint.XMSGS_OPTION);
+            return;
         }
 
         String sep = "";
