diff --git a/src/Model/Item.php b/src/Model/Item.php
index 1ccd85c64..4645f553a 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1734,7 +1734,6 @@ class Item
 			// Update the contact relations
 			Contact\Relation::store($toplevel_parent['author-id'], $item['author-id'], $item['created']);
 
-			unset($item['parent']);
 			unset($item['parent_origin']);
 		} else {
 			$parent_id = 0;
@@ -1777,11 +1776,13 @@ class Item
 			$item['parent'] = $parent_id;
 			Hook::callAll('post_local', $item);
 			unset($item['edit']);
-			unset($item['parent']);
 		} else {
 			Hook::callAll('post_remote', $item);
 		}
 
+		// Set after the insert because top-level posts are self-referencing
+		unset($item['parent']);
+
 		if (!empty($item['cancel'])) {
 			Logger::log('post cancelled by addon.');
 			return 0;