diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
index 267d1b2cb..f40ca685d 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
@@ -2,7 +2,9 @@
 {{/if~}}
 {{#if isFriend}}friend {{/if~}}
 {{~tag}} {{#if (contains (arr "explicit" "partial") template.kind)~}}
-    {{>symbol/name template.primary ~}}{{>template/args args=template.args ~}}
+    {{!~ If the last part is a template specialization, we include links to primary template and the arguments. ~}}
+    {{!~ If the primary template wasn't correctly extracted for some reason, we just print the name as usual. ~}}
+    {{#if template.primary }}{{~>symbol/name template.primary ~}}{{else}}{{ name }}{{/if}}{{>template/args args=template.args ~}}
 {{~else~}}
     {{>symbol/name-text symbol ~}}
 {{~/if}}
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.adoc b/test-files/golden-tests/templates/ct_expl_dependency.adoc
new file mode 100644
index 000000000..71ee8718d
--- /dev/null
+++ b/test-files/golden-tests/templates/ct_expl_dependency.adoc
@@ -0,0 +1,50 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+=== Types
+
+[cols=1]
+|===
+| Name
+| link:#A[`A&lt;int&gt;`] 
+|===
+
+[#A]
+== A&lt;int&gt;
+
+=== Synopsis
+
+Declared in `&lt;ct&lowbar;expl&lowbar;dependency&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;&gt;
+struct A&lt;int&gt;;
+----
+
+=== Member Functions
+
+[cols=1]
+|===
+| Name
+| link:#A-g[`g`] 
+|===
+
+[#A-g]
+== link:#A[A&lt;int&gt;]::g
+
+=== Synopsis
+
+Declared in `&lt;ct&lowbar;expl&lowbar;dependency&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+g();
+----
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.cpp b/test-files/golden-tests/templates/ct_expl_dependency.cpp
new file mode 100644
index 000000000..5577ed5e2
--- /dev/null
+++ b/test-files/golden-tests/templates/ct_expl_dependency.cpp
@@ -0,0 +1,5 @@
+template<typename T>
+struct A { void f() { } };
+
+template<>
+struct A<int> { void g() { } };
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.html b/test-files/golden-tests/templates/ct_expl_dependency.html
new file mode 100644
index 000000000..91b681dc6
--- /dev/null
+++ b/test-files/golden-tests/templates/ct_expl_dependency.html
@@ -0,0 +1,79 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index"><a href="#index"></a></h2>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#A"><code>A&lt;int&gt;</code></a> </td></tr>
+</tbody>
+</table>
+
+</div>
+<div>
+<div>
+<h2 id="A"><a href="#A">A&lt;int&gt;</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;ct_expl_dependency.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">template&lt;&gt;
+struct A&lt;int&gt;;
+
+</code>
+</pre>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#A-g"><code>g</code></a> </td></tr>
+</tbody>
+</table>
+
+
+
+</div>
+<div>
+<div>
+<h2 id="A-g"><a href="#A-g">A&lt;int&gt;::g</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;ct_expl_dependency.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+g();
+
+</code>
+</pre>
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.xml b/test-files/golden-tests/templates/ct_expl_dependency.xml
new file mode 100644
index 000000000..30bb807a2
--- /dev/null
+++ b/test-files/golden-tests/templates/ct_expl_dependency.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <template class="explicit">
+    <targ class="type" type="int"/>
+    <struct name="A" id="AKwlChAOi+0ttIAPsD7uitS+gk0=">
+      <file short-path="ct_expl_dependency.cpp" source-path="ct_expl_dependency.cpp" line="5" class="def"/>
+      <function name="g" id="NCn1LYKSU8X/x/ejZTTGKsJQLug=">
+        <file short-path="ct_expl_dependency.cpp" source-path="ct_expl_dependency.cpp" line="5" class="def"/>
+      </function>
+    </struct>
+  </template>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/templates/ct_expl_dependency.yml b/test-files/golden-tests/templates/ct_expl_dependency.yml
new file mode 100644
index 000000000..776d6aec3
--- /dev/null
+++ b/test-files/golden-tests/templates/ct_expl_dependency.yml
@@ -0,0 +1,2 @@
+exclude-symbols:
+  - 'A'
