diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
index 31759b7c3..67b2eb195 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
@@ -331,6 +331,7 @@ void writeTableClose(TableCloseTag token) {
   }
 
   void writeMoeEndStripComment(MoeEndStripComment token) {
+    requestedWhitespace = NONE;
     writeLineBreakNoAutoIndent();
     output.append(indentForMoeEndStripComment);
 
diff --git a/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java b/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
index 84387e61d..5badf333c 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
@@ -1897,7 +1897,6 @@ public void markdownMoeComments() {
         class Test {}
         """
             .replace("moe", "MOE");
-    // TODO(kak): Ideally the extra blank lines would not be inserted after the code block
     String expected =
         """
         /// This is the first line.
@@ -1908,8 +1907,6 @@ class Test {}
         /// ```
         /// this is a code block
         /// ```
-        ///
-        ///
         /// <!-- moe:end_intracomment_strip -->
         class Test {}
         """