diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 693a9e343d..3e73b5b5ed 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -414,7 +414,25 @@ class Notifier
 			}
 		}
 
-		$inboxes = ActivityPub::fetchTargetInboxes($target_item);
+		$inboxes = [];
+
+		if ($followup) {
+			$profile = ActivityPub::fetchprofile($parent['author-link']);
+			if (!empty($profile)) {
+				$target = defaults($profile, 'sharedinbox', $profile['inbox']);
+				$inboxes[$target] = $target;
+			}
+		} else {
+			if ($target_item['origin']) {
+				$inboxes = ActivityPub::fetchTargetInboxes($target_item);
+			}
+
+			if ($parent['origin']) {
+				$parent_inboxes = ActivityPub::fetchTargetInboxes($parent);
+				$inboxes = array_merge($inboxes, $parent_inboxes);
+			}
+		}
+
 		foreach ($inboxes as $inbox) {
 			logger('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);