diff --git a/lib/inbox-listeners.js b/lib/inbox-listeners.js
index e59c62e..a8839e7 100644
--- a/lib/inbox-listeners.js
+++ b/lib/inbox-listeners.js
@@ -431,6 +431,7 @@ export function registerInboxListeners(inboxChain, options) {
 
           await addNotification(collections, {
             uid: object.id?.href || `reply:${actorUrl}:${inReplyTo}`,
+            url: object.url?.href || object.id?.href || "",
             type: "reply",
             actorUrl: actorInfo.url,
             actorName: actorInfo.name,
@@ -462,6 +463,7 @@ export function registerInboxListeners(inboxChain, options) {
 
             await addNotification(collections, {
               uid: object.id?.href || `mention:${actorUrl}:${object.id?.href}`,
+              url: object.url?.href || object.id?.href || "",
               type: "mention",
               actorUrl: actorInfo.url,
               actorName: actorInfo.name,
diff --git a/package.json b/package.json
index b6e2c34..aaec421 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",
diff --git a/views/partials/ap-item-card.njk b/views/partials/ap-item-card.njk
index 08b1a33..f108f69 100644
--- a/views/partials/ap-item-card.njk
+++ b/views/partials/ap-item-card.njk
@@ -230,7 +230,7 @@
         if (this.error) setTimeout(() => this.error = '', 3000);
       }
     }">
-    <a href="{{ mountPath }}/admin/reader/compose?replyTo={{ itemUid | urlencode }}"
+    <a href="{{ mountPath }}/admin/reader/compose?replyTo={{ (itemUrl or itemUid) | urlencode }}"
        class="ap-card__action ap-card__action--reply"
        title="{{ __('activitypub.reader.actions.reply') }}">
       ↩ {{ __("activitypub.reader.actions.reply") }}{% if replyCount != null %}<span class="ap-card__count">{{ replyCount }}</span>{% endif %}
diff --git a/views/partials/ap-notification-card.njk b/views/partials/ap-notification-card.njk
index 487833f..c64d12f 100644
--- a/views/partials/ap-notification-card.njk
+++ b/views/partials/ap-notification-card.njk
@@ -56,10 +56,10 @@
 
     {% if item.type == "reply" or item.type == "mention" %}
       <div class="ap-notification__actions">
-        <a href="{{ mountPath }}/admin/reader/compose?replyTo={{ item.uid | urlencode }}" class="ap-notification__reply-btn" title="{{ __('activitypub.reader.actions.reply') }}">
+        <a href="{{ mountPath }}/admin/reader/compose?replyTo={{ (item.url or item.uid) | urlencode }}" class="ap-notification__reply-btn" title="{{ __('activitypub.reader.actions.reply') }}">
           ↩ {{ __("activitypub.reader.actions.reply") }}
         </a>
-        <a href="{{ mountPath }}/admin/reader/post?url={{ item.uid | urlencode }}" class="ap-notification__thread-btn" title="{{ __('activitypub.reader.post.title') }}">
+        <a href="{{ mountPath }}/admin/reader/post?url={{ (item.url or item.uid) | urlencode }}" class="ap-notification__thread-btn" title="{{ __('activitypub.reader.post.title') }}">
           💬 {{ __("activitypub.notifications.viewThread") }}
         </a>
       </div>