@@ -5,6 +5,9 @@
 ### Added
 - Added a **Rich Text Toolbar** field setting to choose the formatting buttons in rich-text cells, with new underline, strikethrough, subscript, superscript and inline code options ([#84](https://github.com/verbb/tablemaker/issues/84)).
 
+### Fixed
+- Fixed rich-text element links retaining outdated URLs and reference fragments in rendered tables ([#84](https://github.com/verbb/tablemaker/issues/84)).
+
 ## 5.1.7 - 2026-11-05
 
 ### Removed
 
@@ -10,6 +10,7 @@
 use craft\helpers\HtmlPurifier;
 use craft\helpers\Json;
 use craft\helpers\StringHelper;
+use craft\helpers\UrlHelper;
 use craft\validators\ColorValidator;
 use craft\validators\UrlValidator;
 
@@ -877,23 +878,60 @@ private static function renderCellHtml(string $type, mixed $value, ?int $siteId
         if ($type === 'richtext') {
             $html = self::sanitizeRichText($string);
 
-            // CraftLink stores a stable reference fragment beside the current URL.
-            // Resolve it only for rendered output; raw cell data must retain the tag
-            // so later URI changes can still be reflected.
-            if ($siteId !== null) {
-                $html = Craft::$app->getElements()->parseRefs($html, $siteId);
+            // CraftLink's URL fragments are not ref tags. Convert them only for
+            // output so saved cells keep their stable IDs after URI changes.
+            $html = self::_resolveRichTextLinkRefs($html, $siteId);
+            $html = Craft::$app->getElements()->parseRefs($html, $siteId);
 
-                // Reference attributes are dynamic content, so enforce the same
-                // rich-text policy after Craft has inserted their current values.
-                $html = self::sanitizeRichText($html);
-            }
+            // Reference attributes are dynamic content, so enforce the same
+            // rich-text policy after Craft has inserted their current values.
+            $html = self::sanitizeRichText($html);
 
             return $html;
         }
 
         return Html::encode($string);
     }
 
+    private static function _resolveRichTextLinkRefs(string $html, ?int $defaultSiteId): string
+    {
+        $resolved = [];
+
+        // Purification has normalized attribute quotes. Match anchor attributes
+        // only, leaving reference-like text in prose and code samples untouched.
+        return preg_replace_callback(
+            '/(<a\b[^>]*?\shref=")([^"?#{}]*)(\?[^"#{}]*)?(#[^"#{}]*)?(?:#|%23)(entry|category|asset):(\d+)(?:@(\d+))?(?::url)?"/',
+            function(array $matches) use ($defaultSiteId, &$resolved): string {
+                [, $prefix, $url, $query, $fragment, $type, $id, $siteId] = array_pad($matches, 8, '');
+                $ref = '{' . $type . ':' . $id . ($siteId !== '' ? '@' . $siteId : '') . ':url}';
+                $currentUrl = $resolved[$ref] ??= Craft::$app->getElements()->parseRefs($ref, $defaultSiteId);
+
+                // Deleted elements retain their last saved URL without the editor marker.
+                if ($currentUrl === $ref) {
+                    return $prefix . $url . $query . $fragment . '"';
+                }
+
+                // Keep custom suffixes, but let the element own its current route
+                // parameters (e.g. ?p=news/updated) and any intrinsic fragment.
+                if ($query !== '') {
+                    $currentQuery = parse_url($currentUrl, PHP_URL_QUERY);
+                    $currentUrl = UrlHelper::urlWithParams($currentUrl, Html::decode(ltrim($query, '?')));
+
+                    if ($currentQuery) {
+                        $currentUrl = UrlHelper::urlWithParams($currentUrl, $currentQuery);
+                    }
+                }
+
+                if ($fragment !== '' && !parse_url($currentUrl, PHP_URL_FRAGMENT)) {
+                    $currentUrl .= Html::decode($fragment);
+                }
+
+                return $prefix . Html::encode($currentUrl) . '"';
+            },
+            $html,
+        );
+    }
+
     /** Keep the cell contract as HTML text while enforcing the vocabulary of Table Maker's toolbar options. */
     private static function sanitizeRichText(string $value): string
     {
 
@@ -4,6 +4,8 @@
 
 use craft\elements\Entry;
 use craft\fieldlayoutelements\CustomField;
+use craft\helpers\Html;
+use craft\helpers\UrlHelper;
 use craft\models\EntryType;
 use craft\models\FieldLayout;
 use craft\models\FieldLayoutTab;
@@ -135,6 +137,67 @@
         ->and($html)->not->toContain('onerror');
 });
 
+it('resolves CraftLink fragments after the linked entry URI changes', function(string $marker, bool $explicitSite, string $suffix) {
+    $siteId = $this->entry->siteId;
+    $settings = $this->section->getSiteSettings();
+    $settings[$siteId]->hasUrls = true;
+    $settings[$siteId]->uriFormat = 'news/{slug}';
+    $this->section->setSiteSettings($settings);
+    expect(Craft::$app->getEntries()->saveSection($this->section))->toBeTrue();
+    expect(Craft::$app->getElements()->saveElement($this->entry))->toBeTrue();
+    $oldUrl = $this->entry->getUrl();
+    $ref = $marker . 'entry:' . $this->entry->id . ($explicitSite ? '@' . $siteId : '');
+    $sourceUrl = UrlHelper::urlWithParams($oldUrl, Html::decode($suffix));
+    $source = '<p><a href="' . Html::encode($sourceUrl) . $ref . '" target="_blank">Read more</a></p>';
+    $value = $this->tableField->normalizeValue([
+        'columns' => [['heading' => 'Reference', 'type' => 'richtext']],
+        'rows' => [[$source]],
+    ], $this->entry);
+    $stored = $value->toStorage();
+
+    $this->entry->slug = 'updated-link';
+    expect(Craft::$app->getElements()->saveElement($this->entry))->toBeTrue();
+    $currentUrl = $this->entry->getUrl();
+    $expectedUrl = Html::encode(UrlHelper::urlWithParams($currentUrl, Html::decode($suffix)));
+    expect($currentUrl)->not->toBe($oldUrl);
+
+    // An explicit link site must win over the owning cell's site.
+    $value->siteId = $explicitSite ? 999999 : $siteId;
+    $html = (string)$value->getTable();
+    expect($html)->toContain('href="' . $expectedUrl . '"')
+        ->and($html)->toContain('target="_blank"')
+        ->and($html)->not->toContain($marker . 'entry:', '{entry:')
+        ->and($value->toStorage())->toBe($stored);
+
+    // Standalone values without an owner still use Craft's default site.
+    $standalone = verbb\tablemaker\helpers\TableValue::normalize($stored);
+    expect((string)$standalone->getTable())->toContain('href="' . $expectedUrl . '"');
+})->with([
+    'explicit site' => ['#', true, ''],
+    'owning site and suffix' => ['#', false, '?source=table&amp;page=2#details'],
+    'encoded marker' => ['%23', true, '?source=table#details'],
+]);
+
+it('keeps ordinary links and falls back to saved URLs for missing CraftLink elements', function() {
+    $source = '<p><a href="https://example.test/page#details">Anchor</a> '
+        . '<a href="https://example.test/old?source=table#details#entry:999999999@1">Missing entry</a> '
+        . '<a href="https://example.test/category#category:999999999">Missing category</a> '
+        . '<a href="https://example.test/file.pdf%23asset:999999999">Missing asset</a></p>'
+        . '<p><code>href="https://example.test/sample#entry:123"</code></p>';
+    $value = $this->tableField->normalizeValue([
+        'columns' => [['heading' => 'Reference', 'type' => 'richtext']],
+        'rows' => [[$source]],
+    ], $this->entry);
+
+    expect((string)$value->getTable())->toContain(
+        'href="https://example.test/page#details"',
+        'href="https://example.test/old?source=table#details"',
+        'href="https://example.test/category"',
+        'href="https://example.test/file.pdf"',
+        '<code>href="https://example.test/sample#entry:123"</code>',
+    )->not->toContain('#entry:999999999', '#category:', '%23asset:');
+});
+
 it('rejects invalid numbers without replacing saved table content', function(string $number) {
     $handle = $this->tableField->handle;
     $this->entry->setFieldValueFromRequest($handle, [