diff --git a/app/Views/libri/scheda_libro.php b/app/Views/libri/scheda_libro.php
index 3add05f90..f8f7d8753 100644
--- a/app/Views/libri/scheda_libro.php
+++ b/app/Views/libri/scheda_libro.php
@@ -223,20 +223,25 @@ class="inline-flex items-center px-2 py-1 rounded-full text-sm bg-gray-100 text-
             <span class="font-medium"><?= __("Genere:") ?></span>
             <?php
               $genreParts = [];
-              if (!empty($libro['radice_id'])) {
-                  $genreParts[] = [(int)$libro['radice_id'], (string)$libro['radice_nome']];
-              }
-              if (!empty($libro['genere_id'])) {
-                  $genName = (string)$libro['genere_nome'];
-                  if (strpos($genName, ' - ') !== false) {
-                      $parts = explode(' - ', $genName);
-                      $genName = end($parts);
+              $addGenrePart = static function (int $id, ?string $name) use (&$genreParts): void {
+                  $name = trim((string)$name);
+                  if ($id <= 0 || $name === '') {
+                      return;
                   }
-                  $genreParts[] = [(int)$libro['genere_id'], $genName];
-              }
-              if (!empty($libro['sottogenere_id'])) {
-                  $genreParts[] = [(int)$libro['sottogenere_id'], (string)$libro['sottogenere_nome']];
-              }
+                  if (strpos($name, ' - ') !== false) {
+                      $parts = explode(' - ', $name);
+                      $name = trim((string)end($parts));
+                  }
+                  foreach ($genreParts as $part) {
+                      if ((int)$part[0] === $id) {
+                          return;
+                      }
+                  }
+                  $genreParts[] = [$id, $name];
+              };
+              $addGenrePart((int)($libro['radice_id'] ?? 0), $libro['radice_nome'] ?? null);
+              $addGenrePart((int)($libro['genere_id_cascade'] ?? $libro['genere_id'] ?? 0), $libro['genere_nome'] ?? null);
+              $addGenrePart((int)($libro['sottogenere_id_cascade'] ?? $libro['sottogenere_id'] ?? 0), $libro['sottogenere_nome'] ?? null);
             ?>
             <?php if (!empty($genreParts)): ?>
               <?php foreach ($genreParts as $i => $gp): ?>
diff --git a/tests/full-test.spec.js b/tests/full-test.spec.js
index d7e872ea9..b6da28cb4 100644
--- a/tests/full-test.spec.js
+++ b/tests/full-test.spec.js
@@ -2918,8 +2918,12 @@ test.describe.serial('Phase 18: Issue Regressions', () => {
     // 1) Admin book detail page
     await page.goto(`${BASE}/admin/books/${bookId}`);
     await page.waitForLoadState('domcontentloaded');
-    const genreText = await page.locator('[data-testid="genre-display"]').textContent();
+    const genreDisplay = page.locator('[data-testid="genre-display"]');
+    const genreText = await genreDisplay.textContent();
     expect(genreText).toContain(childName);
+    await expect(genreDisplay.locator('a')).toHaveCount(2);
+    await expect(genreDisplay.locator('a').nth(0)).toHaveAttribute('href', new RegExp(`/admin/books\\?genere=${rootId}$`));
+    await expect(genreDisplay.locator('a').nth(1)).toHaveAttribute('href', new RegExp(`/admin/books\\?genere=${childId}$`));
 
     // 2) Frontend (public) book detail page — uses different query path
     await page.goto(`${BASE}/libro/${bookId}`);