diff --git a/src/Model/Item.php b/src/Model/Item.php
index 5cc72b0580..8327252abc 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -659,6 +659,12 @@ class Item
 		$params = ['order' => ['id' => false]];
 		$parent = Post::selectFirst($fields, $condition, $params);
 
+		if (!DBA::isResult($parent) && $item['origin']) {
+			$stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid']);
+			Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
+			$parent = Post::selectFirst($fields, $condition, $params);
+		}
+
 		if (!DBA::isResult($parent)) {
 			Logger::notice('item parent was not found - ignoring item', ['thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
 			return [];
@@ -673,6 +679,13 @@ class Item
 			'uid' => $parent['uid']];
 		$params = ['order' => ['id' => false]];
 		$toplevel_parent = Post::selectFirst($fields, $condition, $params);
+
+		if (!DBA::isResult($toplevel_parent) && $item['origin']) {
+			$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid']);
+			Logger::info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]);
+			$toplevel_parent = Post::selectFirst($fields, $condition, $params);
+		}
+
 		if (!DBA::isResult($toplevel_parent)) {
 			Logger::notice('item top level parent was not found - ignoring item', ['parent-uri-id' => $parent['parent-uri-id'], 'uid' => $parent['uid']]);
 			return [];
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index a53eefa7d1..390dc932c8 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -744,7 +744,7 @@ class Notifier
 
 		// Also don't deliver when the direct thread parent was delivered via Diaspora
 		if ($thr_parent['network'] == Protocol::DIASPORA) {
-			Logger::info('Threat parent network is Diaspora, so no AP delivery');
+			Logger::info('Thread parent network is Diaspora, so no AP delivery');
 			return ['count' => 0, 'contacts' => []];
 		}