diff --git a/src/google/protobuf/compiler/java/doc_comment.cc b/src/google/protobuf/compiler/java/doc_comment.cc
index d5fadb63cf..75cb466e40 100644
--- a/src/google/protobuf/compiler/java/doc_comment.cc
+++ b/src/google/protobuf/compiler/java/doc_comment.cc
@@ -147,7 +147,9 @@ static void WriteDocCommentBodyForLocation(io::Printer* printer,
                              ? location.trailing_comments
                              : location.leading_comments;
   if (!comments.empty()) {
-    if (!kdoc) {
+    if (kdoc) {
+      comments = EscapeKdoc(comments);
+    } else {
       comments = EscapeJavadoc(comments);
     }