diff --git a/links/templates/links/bookmark_detail.html b/links/templates/links/bookmark_detail.html
index 9e57591..e78a451 100644
--- a/links/templates/links/bookmark_detail.html
+++ b/links/templates/links/bookmark_detail.html
@@ -84,7 +84,7 @@
       <div class="bm-quote">{% trans "This post is unavailable." %}</div>
       {% else %}
       {% with qa=q.author %}
-      <a class="bm-quote" href="{{ q.url|default:'https://x.com/i/status/'|add:q.id }}" target="_blank" rel="noopener">
+      <a class="bm-quote" href="{% if q.url %}{{ q.url }}{% else %}https://x.com/i/status/{{ q.id }}{% endif %}" target="_blank" rel="noopener">
         <div class="qhead">
           {% if qa.profile_image_url %}<img src="{{ qa.profile_image_url }}" loading="lazy" alt="">{% endif %}
           <span class="name">{{ qa.name|default:'' }}</span>
diff --git a/links/templates/links/includes/bookmark_list_items.html b/links/templates/links/includes/bookmark_list_items.html
index 9b8eba0..2fb7ed3 100644
--- a/links/templates/links/includes/bookmark_list_items.html
+++ b/links/templates/links/includes/bookmark_list_items.html
@@ -30,7 +30,7 @@
         {% if b.tweet_created_at %}<span class="sep">·</span><span class="time">{{ b.tweet_created_at|date:"M j, Y" }}</span>{% endif %}
       </div>
     </div>
-    <a class="bm-ext" href="{{ b.url|default:'https://x.com/i/status/'|add:b.tweet_id }}"
+    <a class="bm-ext" href="{% if b.url %}{{ b.url }}{% else %}https://x.com/i/status/{{ b.tweet_id }}{% endif %}"
        target="_blank" rel="noopener" title="{% trans 'Open on X' %}" onclick="event.stopPropagation()">
       <svg width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" viewBox="0 0 24 24"><path d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"/></svg>
     </a>
@@ -53,7 +53,7 @@
       </div>
       {% elif m.type == 'video' or m.type == 'animated_gif' %}
       {% with v=m.video %}
-      <a class="bm-cell" href="{{ b.url|default:'https://x.com/i/status/'|add:b.tweet_id }}"
+      <a class="bm-cell" href="{% if b.url %}{{ b.url }}{% else %}https://x.com/i/status/{{ b.tweet_id }}{% endif %}"
          target="_blank" rel="noopener" title="{% trans 'Open on X to play' %}" onclick="event.stopPropagation()">
         <span class="bm-vbadge">{% if m.type == 'animated_gif' %}GIF{% else %}VIDEO{% endif %}</span>
         <img loading="lazy" src="{{ v.poster|default:m.media_thumb|default:m.media_large|default:m.media_url }}" alt="">
@@ -90,7 +90,7 @@
     <div class="bm-quote">{% trans "This post is unavailable." %}</div>
     {% else %}
     {% with qa=q.author %}
-    <a class="bm-quote" href="{{ q.url|default:'https://x.com/i/status/'|add:q.id }}"
+    <a class="bm-quote" href="{% if q.url %}{{ q.url }}{% else %}https://x.com/i/status/{{ q.id }}{% endif %}"
        target="_blank" rel="noopener" onclick="event.stopPropagation()">
       <div class="qhead">
         {% if qa.profile_image_url %}<img src="{{ qa.profile_image_url }}" loading="lazy" alt="">{% endif %}
@@ -120,4 +120,4 @@
   <div class="tle">{% trans "No bookmarks found" %}</div>
   {% trans "Try a different search or filter." %}
 </div>
-{% endfor %}
\ No newline at end of file
+{% endfor %}