diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterMarkdownComment.java b/java/java-tests/testData/codeInsight/overrideImplement/afterMarkdownComment.java
new file mode 100644
index 000000000000..5c8faeffee8a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/overrideImplement/afterMarkdownComment.java
@@ -0,0 +1,14 @@
+public interface GenericInterfaceWithMarkdown<A> {
+
+  /// For some reason, markdown comments break
+  /// generated implementation in the current release (2025.2)
+  /// but not on master, so here's a test
+  A functionWithMarkdown();
+}
+
+class DefaultImpl implements GenericInterfaceWithMarkdown<String> {
+    @Override
+    public String functionWithMarkdown() {
+        return "";
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/overrideImplement/beforeMarkdownComment.java b/java/java-tests/testData/codeInsight/overrideImplement/beforeMarkdownComment.java
new file mode 100644
index 000000000000..f82879c86f33
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/overrideImplement/beforeMarkdownComment.java
@@ -0,0 +1,11 @@
+public interface GenericInterfaceWithMarkdown<A> {
+
+  /// For some reason, markdown comments break
+  /// generated implementation in the current release (2025.2)
+  /// but not on master, so here's a test
+  A functionWithMarkdown();
+}
+
+class DefaultImpl implements GenericInterfaceWithMarkdown<String> {
+    <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
index 6bf3cebe93c0..7d0e7bc861bd 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
@@ -702,6 +702,10 @@ public class OverrideImplementTest extends LightJavaCodeInsightFixtureTestCase {
     doTest(true);
   }
 
+  public void testMarkdownComment() {
+    doTest(true);
+  }
+
   private void doTest(boolean toImplement) {
     final String name = getTestName(false);
     myFixture.configureByFile("before" + name + ".java");