diff --git a/src/Api/Serializers/DiscussionBasicSerializer.php b/src/Api/Serializers/DiscussionBasicSerializer.php
index 8ed30c205..36d5af012 100644
--- a/src/Api/Serializers/DiscussionBasicSerializer.php
+++ b/src/Api/Serializers/DiscussionBasicSerializer.php
@@ -56,6 +56,6 @@ class DiscussionBasicSerializer extends BaseSerializer
 
     public function addedPosts()
     {
-        return $this->hasMany('Flarum\Api\Serializers\PostBasicSerializer');
+        return $this->hasMany('Flarum\Api\Serializers\PostSerializer');
     }
 }
diff --git a/src/Api/Serializers/PostBasicSerializer.php b/src/Api/Serializers/PostBasicSerializer.php
index 4c96e7c29..66e0490e0 100644
--- a/src/Api/Serializers/PostBasicSerializer.php
+++ b/src/Api/Serializers/PostBasicSerializer.php
@@ -41,7 +41,7 @@ class PostBasicSerializer extends BaseSerializer
         if ($post->type === 'comment') {
             $attributes['content'] = str_limit($post->content, 200);
         } else {
-            $attributes['content'] = json_encode($post->content);
+            $attributes['content'] = $post->content;
         }
 
         return $this->extendAttributes($post, $attributes);