diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php
index 2190303ed..b3ba463da 100644
--- a/app/Transformer/Api/StatusStatelessTransformer.php
+++ b/app/Transformer/Api/StatusStatelessTransformer.php
@@ -15,6 +15,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
 {
 	protected $defaultIncludes = [
 		'account',
+		'tags',
 		'media_attachments',
 	];
 
@@ -72,6 +73,13 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
 		return $this->item($account, new AccountTransformer());
 	}
 
+	public function includeTags(Status $status)
+	{
+		$tags = $status->hashtags;
+
+		return $this->collection($tags, new HashtagTransformer());
+	}
+
 	public function includeMediaAttachments(Status $status)
 	{
 		return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(3), function() use($status) {
diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php
index a4359ae76..4ff621872 100644
--- a/app/Transformer/Api/StatusTransformer.php
+++ b/app/Transformer/Api/StatusTransformer.php
@@ -17,6 +17,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
 {
 	protected $defaultIncludes = [
 		'account',
+		'tags',
 		'media_attachments',
 	];
 
@@ -74,6 +75,13 @@ class StatusTransformer extends Fractal\TransformerAbstract
 		return $this->item($account, new AccountTransformer());
 	}
 
+	public function includeTags(Status $status)
+	{
+		$tags = $status->hashtags;
+
+		return $this->collection($tags, new HashtagTransformer());
+	}
+
 	public function includeMediaAttachments(Status $status)
 	{
 		return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(14), function() use($status) {