diff --git a/GanjooRazor/Pages/Partials/GanjoorPage/PageTypes/_PoemPagePartial.cshtml b/GanjooRazor/Pages/Partials/GanjoorPage/PageTypes/_PoemPagePartial.cshtml
index 306597e2..177a6597 100644
--- a/GanjooRazor/Pages/Partials/GanjoorPage/PageTypes/_PoemPagePartial.cshtml
+++ b/GanjooRazor/Pages/Partials/GanjoorPage/PageTypes/_PoemPagePartial.cshtml
@@ -444,6 +444,28 @@
                     <svg class="noindent-info-button" height="24px" viewBox="0 0 24 24" width="24px" fill="#5f6368"><path d="M0 0h24v24H0V0z" fill="none" /><path d="M19 8h-1V3H6v5H5c-1.66 0-3 1.34-3 3v6h4v4h12v-4h4v-6c0-1.66-1.34-3-3-3zM8 5h8v3H8V5zm8 12v2H8v-4h8v2zm2-2v-2H6v2H4v-4c0-.55.45-1 1-1h14c.55 0 1 .45 1 1v4h-2z" /><circle cx="18" cy="11.5" r="1" /></svg>
                 </a>
 
+                @{
+                    // distinct persons tagged in this poem (same GeoDateTags rows the map below uses -
+                    // already filtered to approved/non-machine-generated tags by GetPoemGeoDateTagsAsync)
+                    var poemTaggedPersons = Model.GanjoorPage.Poem.GeoDateTags
+                        .Where(t => t.Person != null)
+                        .GroupBy(t => t.PersonId)
+                        .Select(g => g.First().Person)
+                        .ToList();
+                }
+                @if (poemTaggedPersons.Count > 0)
+                {
+                    <div class="notice" id="poem-persons" data-nosnippet>
+                        <div class="century">شخصیت‌های نامبرده در این شعر</div>
+                        <p>
+                            @foreach (var taggedPerson in poemTaggedPersons)
+                            {
+                                <a href="/Person/@taggedPerson.Id" class="pagebutton comments-link">@taggedPerson.Name</a>
+                            }
+                        </p>
+                    </div>
+                }
+
                 @if (!Model.OfflineMode && Model.GanjoorPage.Poem.GeoDateTags.Any(t => t.Location != null))
                 {
                     <div id="catmap"></div>