diff --git a/app/Profile.php b/app/Profile.php
index b1b73abf6..c620582b1 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -125,13 +125,15 @@ class Profile extends Model
 
     public function avatar()
     {
-        return $this->hasOne(Avatar::class);
+        return $this->hasOne(Avatar::class)->withDefault([
+            'media_path' => 'public/avatars/default.png'
+        ]);
     }
 
     public function avatarUrl()
     {
         $url = Cache::remember("avatar:{$this->id}", 1440, function() {
-            $path = $this->avatar->media_path ?? 'public/avatars/default.png';
+            $path = optional($this->avatar)->media_path;
             $version = hash('sha1', $this->avatar->created_at);
             $path = "{$path}?v={$version}";
             return url(Storage::url($path));
diff --git a/app/Transformer/ActivityPub/ProfileOutbox.php b/app/Transformer/ActivityPub/ProfileOutbox.php
index 6a0e7cacc..02dcb4b65 100644
--- a/app/Transformer/ActivityPub/ProfileOutbox.php
+++ b/app/Transformer/ActivityPub/ProfileOutbox.php
@@ -50,7 +50,6 @@ class ProfileOutbox extends Fractal\TransformerAbstract
             'sensitive' => (bool) $i->is_nsfw,
             'atomUri' => $i->url(),
             'inReplyToAtomUri' => null,
-            'conversation' => $i->url(),
             'attachment' => [
 
               // TODO: support more than 1 attachment
diff --git a/app/Transformer/ActivityPub/StatusTransformer.php b/app/Transformer/ActivityPub/StatusTransformer.php
index 4b48b1f65..fb90cbd5a 100644
--- a/app/Transformer/ActivityPub/StatusTransformer.php
+++ b/app/Transformer/ActivityPub/StatusTransformer.php
@@ -46,7 +46,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
           'sensitive' => (bool) $status->is_nsfw,
           'atomUri' => $status->url(),
           'inReplyToAtomUri' => null,
-          'conversation' => $status->url(),
           'attachment' => $status->media->map(function($media) {
             return [
               'type' => 'Document',