diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index 63d903b9df57..3c94d5681a05 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -2320,7 +2320,7 @@ public class JavaDocInfoGenerator {
     PsiElement label = referenceLink.getLabel();
 
     String referenceText = reference != null ? reference.getText() : "";
-    String labelText = label != null ? label.getText() : "";
+    String labelText = label instanceof PsiMarkdownReferenceLabel ? label.getText() : null;
 
     // JEP 467 requires reference brackets to be escaped, remove the escape to match the reference
     referenceText = referenceText.replace("\\[", "[").replace("\\]", "]");
diff --git a/java/java-tests/testData/codeInsight/javadocIG/allTagsMarkdown.html b/java/java-tests/testData/codeInsight/javadocIG/allTagsMarkdown.html
index d71078de70ad..a73a2e11690d 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/allTagsMarkdown.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/allTagsMarkdown.html
@@ -3,9 +3,9 @@
  Returns calculated result. <br>
  <code><span style="">Math.<wbr>E</span></code> <br>
  &lt;T&gt; <br>
- <a href="psi_element://java.lang.Math#E"><code><span style="color:#660e7a;">Math#E</span></code></a> <br>
+ <a href="psi_element://java.lang.Math#E"><code><span style="color:#0000ff;">Math</span><span style="">.</span><span style="color:#660e7a;">E</span></code></a> <br>
  <a href="psi_element://java.lang.Math#E">Euler constant</a> <br>
  calculation <br>
  <code><span style="">java.<wbr>version</span></code> <br>
  <a href="psi_element://java.lang.Math#E">2.718281828459045</a></p> <pre> <span style="color:#000080;font-weight:bold;">return</span> a <span style="">+</span> b;</pre>
-</div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Deprecated</p></td><td valign="top"><p>use <a href="psi_element://java.lang.Math#addExact(int, int)"><code><span style="color:#0000ff;">Math#addExact</span></code></a></p></td></tr><tr><td valign="top" class="section"><p>Params:</p></td><td valign="top"><p><code><span style="color:#000000;">a</span></code> – first parameter<br><code><span style="color:#000000;">b</span></code> – second parameter</p></td></tr><tr><td valign="top" class="section"><p>Type parameters:</p></td><td valign="top"><p><code>&lt;<span style="color:#20999d;">T</span>&gt;</code> – type parameter</p></td></tr><tr><td valign="top" class="section"><p>Returns:</p></td><td valign="top"><p>sum result</p></td></tr><tr><td valign="top" class="section"><p>Throws:</p></td><td valign="top"><p><a href="psi_element://java.lang.ArithmeticException"><code><span style="color:#0000ff;">ArithmeticException</span></code></a> – overflow</p><p><a href="psi_element://java.lang.IllegalArgumentException"><code><span style="color:#0000ff;">IllegalArgumentException</span></code></a> – invalid input</p></td></tr><tr><td valign="top" class="section"><p>Since:</p></td><td valign="top"><p>1.0</p></td></tr><tr><td valign="top" class="section"><p>Version:</p></td><td valign="top"><p>2.0</p></td></tr><tr><td valign="top" class="section"><p>Author:</p></td><td valign="top"><p>John Doe</p></td></tr><tr><td valign="top" class="section"><p>See Also:</p></td><td valign="top"><p><a href="psi_element://java.lang.Math#E"><code><span style="color:#0000ff;">Math</span><span style="">.</span><span style="color:#660e7a;">E</span></code></a></p></td></tr><tr><td valign="top" class="section"><p>spec</p></td><td valign="top"><p><a href="https://example.com">link<icon src="AllIcons.Ide.External_link_arrow"></icon></a> spec</p></td></tr><tr><td valign="top" class="section"><p>provides</p></td><td valign="top"><p>Math</p></td></tr><tr><td valign="top" class="section"><p>uses</p></td><td valign="top"><p>Math</p></td></tr><tr><td valign="top" class="section"><p>hidden</p></td><td valign="top"></td></tr></tbody></table></body></html>
\ No newline at end of file
+</div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Deprecated</p></td><td valign="top"><p>use <a href="psi_element://java.lang.Math#addExact(int, int)"><code><span style="color:#0000ff;">Math</span><span style="">.</span><span style="color:#0000ff;">addExact</span></code></a></p></td></tr><tr><td valign="top" class="section"><p>Params:</p></td><td valign="top"><p><code><span style="color:#000000;">a</span></code> – first parameter<br><code><span style="color:#000000;">b</span></code> – second parameter</p></td></tr><tr><td valign="top" class="section"><p>Type parameters:</p></td><td valign="top"><p><code>&lt;<span style="color:#20999d;">T</span>&gt;</code> – type parameter</p></td></tr><tr><td valign="top" class="section"><p>Returns:</p></td><td valign="top"><p>sum result</p></td></tr><tr><td valign="top" class="section"><p>Throws:</p></td><td valign="top"><p><a href="psi_element://java.lang.ArithmeticException"><code><span style="color:#0000ff;">ArithmeticException</span></code></a> – overflow</p><p><a href="psi_element://java.lang.IllegalArgumentException"><code><span style="color:#0000ff;">IllegalArgumentException</span></code></a> – invalid input</p></td></tr><tr><td valign="top" class="section"><p>Since:</p></td><td valign="top"><p>1.0</p></td></tr><tr><td valign="top" class="section"><p>Version:</p></td><td valign="top"><p>2.0</p></td></tr><tr><td valign="top" class="section"><p>Author:</p></td><td valign="top"><p>John Doe</p></td></tr><tr><td valign="top" class="section"><p>See Also:</p></td><td valign="top"><p><a href="psi_element://java.lang.Math#E"><code><span style="color:#0000ff;">Math</span><span style="">.</span><span style="color:#660e7a;">E</span></code></a></p></td></tr><tr><td valign="top" class="section"><p>spec</p></td><td valign="top"><p><a href="https://example.com">link<icon src="AllIcons.Ide.External_link_arrow"></icon></a> spec</p></td></tr><tr><td valign="top" class="section"><p>provides</p></td><td valign="top"><p>Math</p></td></tr><tr><td valign="top" class="section"><p>uses</p></td><td valign="top"><p>Math</p></td></tr><tr><td valign="top" class="section"><p>hidden</p></td><td valign="top"></td></tr></tbody></table></body></html>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/linkInParamDescriptionMarkdown.html b/java/java-tests/testData/codeInsight/javadocIG/linkInParamDescriptionMarkdown.html
index c95f3407a425..2f469837ff23 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/linkInParamDescriptionMarkdown.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/linkInParamDescriptionMarkdown.html
@@ -1,2 +1,2 @@
 <html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class"></icon>&nbsp;<a href="psi_element://Test"><code><span style="color:#000000;">Test</span></code></a></div><div class="definition"><pre><span style="color:#000080;font-weight:bold;">int</span>&nbsp;<span style="color:#000000;">foo</span><span style="">(</span><br>    <span style="color:#000080;font-weight:bold;">int</span>&nbsp;<span style="color:#000000;">a</span><span style="">,</span>
-    <span style="color:#000080;font-weight:bold;">int</span>&nbsp;<span style="color:#000000;">b</span><br><span style="">)</span></pre></div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Params:</p></td><td valign="top"><p><code><span style="color:#000000;">a</span></code> – link to <a href="psi_element://java.lang.String"><code><span style="color:#0000ff;">java.<wbr>lang.<wbr>String</span></code></a><br><code><span style="color:#000000;">b</span></code> – link with a <a href="psi_element://java.lang.String">label</a></p></td></tr><tr><td valign="top" class="section"><p>Returns:</p></td><td valign="top"><p>return label with a link <a href="psi_element://java.lang.String"><code><span style="color:#0000ff;">java.<wbr>lang.<wbr>String</span></code></a></p></td></tr></tbody></table></body></html>
\ No newline at end of file
+    <span style="color:#000080;font-weight:bold;">int</span>&nbsp;<span style="color:#000000;">b</span><br><span style="">)</span></pre></div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Params:</p></td><td valign="top"><p><code><span style="color:#000000;">a</span></code> – link to <a href="psi_element://java.lang.String"><code><span style="color:#0000ff;">String</span></code></a><br><code><span style="color:#000000;">b</span></code> – link with a <a href="psi_element://java.lang.String">label</a></p></td></tr><tr><td valign="top" class="section"><p>Returns:</p></td><td valign="top"><p>return label with a link <a href="psi_element://java.lang.String"><code><span style="color:#0000ff;">String</span></code></a></p></td></tr></tbody></table></body></html>
\ No newline at end of file

Deprecated	use `Math#addExact`
Params:	`a` – first parameter `b` – second parameter
Type parameters:	`<T>` – type parameter
Returns:	sum result
Throws:	`ArithmeticException` – overflow `IllegalArgumentException` – invalid input
Since:	1.0
Version:	2.0
Author:	John Doe
See Also:	`Math.E`
spec	link spec
provides	Math
uses	Math
hidden
Deprecated	use `Math.addExact`
Params:	`a` – first parameter `b` – second parameter
Type parameters:	`<T>` – type parameter
Returns:	sum result
Throws:	`ArithmeticException` – overflow `IllegalArgumentException` – invalid input
Since:	1.0
Version:	2.0
Author:	John Doe
See Also:	`Math.E`
spec	link spec
provides	Math
uses	Math
hidden
Params:	`a` – link to `java.lang.String` `b` – link with a label
Returns:	return label with a link `java.lang.String`
Params:	`a` – link to `String` `b` – link with a label
Returns:	return label with a link `String`