diff --git a/app/Transformer/ActivityPub/StatusTransformer.php b/app/Transformer/ActivityPub/StatusTransformer.php
index c0c378c7b..ec7a71d6e 100644
--- a/app/Transformer/ActivityPub/StatusTransformer.php
+++ b/app/Transformer/ActivityPub/StatusTransformer.php
@@ -11,7 +11,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
 {
     public function transform(Status $status)
     {
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             '@context' => [
diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php
index 287393572..1061dadb7 100644
--- a/app/Transformer/ActivityPub/Verb/CreateNote.php
+++ b/app/Transformer/ActivityPub/Verb/CreateNote.php
@@ -52,7 +52,7 @@ class CreateNote extends Fractal\TransformerAbstract
         $emojis = CustomEmoji::scan($status->caption, true) ?? [];
         $emoji = array_merge($emojis, $mentions);
         $tags = array_merge($emoji, $hashtags);
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             '@context' => [
diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php
index 52656efec..0c8e20c03 100644
--- a/app/Transformer/ActivityPub/Verb/Note.php
+++ b/app/Transformer/ActivityPub/Verb/Note.php
@@ -53,7 +53,7 @@ class Note extends Fractal\TransformerAbstract
         $emojis = CustomEmoji::scan($status->caption, true) ?? [];
         $emoji = array_merge($emojis, $mentions);
         $tags = array_merge($emoji, $hashtags);
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             '@context' => [
diff --git a/app/Transformer/ActivityPub/Verb/UpdateNote.php b/app/Transformer/ActivityPub/Verb/UpdateNote.php
index 09d0b5a2b..07f0c7e11 100644
--- a/app/Transformer/ActivityPub/Verb/UpdateNote.php
+++ b/app/Transformer/ActivityPub/Verb/UpdateNote.php
@@ -53,7 +53,7 @@ class UpdateNote extends Fractal\TransformerAbstract
         $emoji = array_merge($emojis, $mentions);
         $tags = array_merge($emoji, $hashtags);
 
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
         $latestEdit = $status->edits()->latest()->first();
 
         return [
diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
index 4516bd874..202b82d54 100644
--- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
+++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
@@ -13,7 +13,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
 {
     public function transform(Status $status)
     {
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             'id' => (string) $status->id,
diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php
index bf6e7597e..db454fc9b 100644
--- a/app/Transformer/Api/StatusStatelessTransformer.php
+++ b/app/Transformer/Api/StatusStatelessTransformer.php
@@ -23,7 +23,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
     {
         $taggedPeople = MediaTagService::get($status->id);
         $poll = $status->type === 'poll' ? PollService::get($status->id) : null;
-        $rendered = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $rendered = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             '_v' => 1,
diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php
index 6f9364194..a4abfad68 100644
--- a/app/Transformer/Api/StatusTransformer.php
+++ b/app/Transformer/Api/StatusTransformer.php
@@ -25,7 +25,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
         $pid = request()->user()->profile_id;
         $taggedPeople = MediaTagService::get($status->id);
         $poll = $status->type === 'poll' ? PollService::get($status->id, $pid) : null;
-        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null;
 
         return [
             '_v' => 1,