diff --git a/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/daos/PostDao.kt b/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/daos/PostDao.kt
index 30a9e9781..4f134348d 100644
--- a/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/daos/PostDao.kt
+++ b/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/daos/PostDao.kt
@@ -396,11 +396,14 @@ interface PostDao {
               ft.rootPostUri AS rootPostUri,
               ft.generation AS generation,
               ft.ancestorCreated AS ancestorCreated,
-              ft.postCreated AS postCreated
+              ft.postCreated AS postCreated,
+              pt.parentPostUri AS parentPostUri
             FROM
               posts p
             JOIN
               FullThread ft ON p.uri = ft.uri
+            LEFT JOIN
+              postThreads pt ON pt.postUri = p.uri
             ORDER BY
               ft.ancestorCreated, ft.generation, ft.postCreated; -- sort by the first reply to the op, then the generation, then the post itself
         """,
diff --git a/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/entities/PostEntity.kt b/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/entities/PostEntity.kt
index 5da8b5b87..32aa89671 100644
--- a/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/entities/PostEntity.kt
+++ b/data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/entities/PostEntity.kt
@@ -206,6 +206,7 @@ data class ThreadedPostEntity(
     val entity: PostEntity,
     val generation: Long,
     val rootPostUri: PostUri?,
+    val parentPostUri: PostUri?,
 )
 
 fun PopulatedPostEntity.asExternalModel(