diff --git a/lib/activity.php b/lib/activity.php
index 779be2a9ad..cd2383808d 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -482,7 +482,9 @@ class Activity
         $activity['verb'] = ActivityVerb::canonical($this->verb);
 
         // url
-        $activity['url'] = $this->id;
+        if ($this->link) {
+            $activity['url'] = $this->link;
+        }
 
         /* Purely extensions hereafter */