diff --git a/framework/core/src/Api/Controller/AbstractSerializeController.php b/framework/core/src/Api/Controller/AbstractSerializeController.php
index bc04cacce..b3def406d 100644
--- a/framework/core/src/Api/Controller/AbstractSerializeController.php
+++ b/framework/core/src/Api/Controller/AbstractSerializeController.php
@@ -102,7 +102,7 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
         );
 
         $serializer = static::$container->make($this->serializer);
-        $serializer->setActor($request->getAttribute('actor'));
+        $serializer->setRequest($request);
 
         $element = $this->createElement($data, $serializer)
             ->with($this->extractInclude($request))
diff --git a/framework/core/src/Api/Serializer/AbstractSerializer.php b/framework/core/src/Api/Serializer/AbstractSerializer.php
index 160fa25e9..beadfade8 100644
--- a/framework/core/src/Api/Serializer/AbstractSerializer.php
+++ b/framework/core/src/Api/Serializer/AbstractSerializer.php
@@ -20,6 +20,7 @@ use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use InvalidArgumentException;
 use LogicException;
+use Psr\Http\Message\ServerRequestInterface as Request;
 use Tobscure\JsonApi\AbstractSerializer as BaseAbstractSerializer;
 use Tobscure\JsonApi\Collection;
 use Tobscure\JsonApi\Relationship;
@@ -28,6 +29,11 @@ use Tobscure\JsonApi\SerializerInterface;
 
 abstract class AbstractSerializer extends BaseAbstractSerializer
 {
+    /**
+     * @var Request
+     */
+    protected $request;
+
     /**
      * @var User
      */
@@ -43,6 +49,23 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
      */
     protected static $container;
 
+    /**
+     * @return Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * @param Request $request
+     */
+    public function setRequest(Request $request)
+    {
+        $this->request = $request;
+        $this->actor = $request->getAttribute('actor');
+    }
+
     /**
      * @return User
      */
@@ -51,14 +74,6 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
         return $this->actor;
     }
 
-    /**
-     * @param User $actor
-     */
-    public function setActor(User $actor)
-    {
-        $this->actor = $actor;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -231,7 +246,7 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
     {
         $serializer = static::$container->make($class);
 
-        $serializer->setActor($this->actor);
+        $serializer->setRequest($this->request);
 
         return $serializer;
     }
diff --git a/framework/core/src/Api/Serializer/BasicPostSerializer.php b/framework/core/src/Api/Serializer/BasicPostSerializer.php
index b12c28175..c7efb3c5b 100644
--- a/framework/core/src/Api/Serializer/BasicPostSerializer.php
+++ b/framework/core/src/Api/Serializer/BasicPostSerializer.php
@@ -44,7 +44,7 @@ class BasicPostSerializer extends AbstractSerializer
         ];
 
         if ($post instanceof CommentPost) {
-            $attributes['contentHtml'] = $post->content_html;
+            $attributes['contentHtml'] = $post->formatContent($this->request);
         } else {
             $attributes['content'] = $post->content;
         }
diff --git a/framework/core/src/Api/Serializer/PostSerializer.php b/framework/core/src/Api/Serializer/PostSerializer.php
index 44ec76460..79f367c70 100644
--- a/framework/core/src/Api/Serializer/PostSerializer.php
+++ b/framework/core/src/Api/Serializer/PostSerializer.php
@@ -43,8 +43,6 @@ class PostSerializer extends BasicPostSerializer
         $canEdit = $gate->allows('edit', $post);
 
         if ($post instanceof CommentPost) {
-            $attributes['contentHtml'] = $post->content_html;
-
             if ($canEdit) {
                 $attributes['content'] = $post->content;
             }
diff --git a/framework/core/src/Formatter/Event/Rendering.php b/framework/core/src/Formatter/Event/Rendering.php
index 97ae53687..415241cb0 100644
--- a/framework/core/src/Formatter/Event/Rendering.php
+++ b/framework/core/src/Formatter/Event/Rendering.php
@@ -11,6 +11,7 @@
 
 namespace Flarum\Formatter\Event;
 
+use Psr\Http\Message\ServerRequestInterface;
 use s9e\TextFormatter\Renderer;
 
 class Rendering
@@ -30,15 +31,22 @@ class Rendering
      */
     public $xml;
 
+    /**
+     * @var ServerRequestInterface
+     */
+    public $request;
+
     /**
      * @param Renderer $renderer
      * @param mixed $context
      * @param string $xml
+     * @param ServerRequestInterface|null $request
      */
-    public function __construct(Renderer $renderer, $context, &$xml)
+    public function __construct(Renderer $renderer, $context, &$xml, ServerRequestInterface $request = null)
     {
         $this->renderer = $renderer;
         $this->context = $context;
         $this->xml = &$xml;
+        $this->request = $request;
     }
 }
diff --git a/framework/core/src/Formatter/Formatter.php b/framework/core/src/Formatter/Formatter.php
index fc2c6421f..0ee53e4ae 100644
--- a/framework/core/src/Formatter/Formatter.php
+++ b/framework/core/src/Formatter/Formatter.php
@@ -16,6 +16,7 @@ use Flarum\Formatter\Event\Parsing;
 use Flarum\Formatter\Event\Rendering;
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
+use Psr\Http\Message\ServerRequestInterface;
 use s9e\TextFormatter\Configurator;
 use s9e\TextFormatter\Unparser;
 
@@ -69,13 +70,14 @@ class Formatter
      *
      * @param string $xml
      * @param mixed $context
+     * @param ServerRequestInterface|null $request
      * @return string
      */
-    public function render($xml, $context = null)
+    public function render($xml, $context = null, ServerRequestInterface $request = null)
     {
         $renderer = $this->getRenderer();
 
-        $this->events->dispatch(new Rendering($renderer, $context, $xml));
+        $this->events->dispatch(new Rendering($renderer, $context, $xml, $request));
 
         return $renderer->render($xml);
     }
diff --git a/framework/core/src/Post/CommentPost.php b/framework/core/src/Post/CommentPost.php
index 588414b42..af311b169 100644
--- a/framework/core/src/Post/CommentPost.php
+++ b/framework/core/src/Post/CommentPost.php
@@ -18,12 +18,12 @@ use Flarum\Post\Event\Posted;
 use Flarum\Post\Event\Restored;
 use Flarum\Post\Event\Revised;
 use Flarum\User\User;
+use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * A standard comment in a discussion.
  *
  * @property string $parsed_content
- * @property string $content_html
  */
 class CommentPost extends Post
 {
@@ -166,11 +166,12 @@ class CommentPost extends Post
     /**
      * Get the content rendered as HTML.
      *
+     * @param ServerRequestInterface $request
      * @return string
      */
-    public function getContentHtmlAttribute()
+    public function formatContent(ServerRequestInterface $request)
     {
-        return static::$formatter->render($this->attributes['content'], $this);
+        return static::$formatter->render($this->attributes['content'], $this, $request);
     }
 
     /**