diff --git a/modules/Fediverse/Controllers/SchedulerController.php b/modules/Fediverse/Controllers/SchedulerController.php
index 3f723fa99765c752490bb7baf8abd4a1e1ecbeed..9be4db346d89f861bda3082ad60bf1399157bd1a 100644
--- a/modules/Fediverse/Controllers/SchedulerController.php
+++ b/modules/Fediverse/Controllers/SchedulerController.php
@@ -28,12 +28,14 @@ class SchedulerController extends Controller
         // Send activity to all followers
         foreach ($scheduledActivities as $scheduledActivity) {
             if ($scheduledActivity->target_actor_id !== null) {
-                // send activity to targeted actor
-                send_activity_to_actor(
-                    $scheduledActivity->actor,
-                    $scheduledActivity->targetActor,
-                    json_encode($scheduledActivity->payload, JSON_THROW_ON_ERROR)
-                );
+                if ($scheduledActivity->actor_id !== $scheduledActivity->target_actor_id) {
+                    // send activity to targeted actor
+                    send_activity_to_actor(
+                        $scheduledActivity->actor,
+                        $scheduledActivity->targetActor,
+                        json_encode($scheduledActivity->payload, JSON_THROW_ON_ERROR)
+                    );
+                }
             } else {
                 // send activity to all actor followers
                 send_activity_to_followers(
diff --git a/modules/Fediverse/Models/PostModel.php b/modules/Fediverse/Models/PostModel.php
index dc6c07a70f8ff8ab6342dc61b8e67f13b50c8766..41540f80748a7feea0f39e0ef51ee4908bed9e44 100644
--- a/modules/Fediverse/Models/PostModel.php
+++ b/modules/Fediverse/Models/PostModel.php
@@ -299,7 +299,7 @@ class PostModel extends BaseUuidModel
                 ->newActivity(
                     'Create',
                     $post->actor_id,
-                    null,
+                    $post->in_reply_to_id === null ? null : $post->reply_to_post->actor_id,
                     $newPostId,
                     $createActivity->toJSON(),
                     $post->published_at,
diff --git a/modules/Fediverse/Objects/NoteObject.php b/modules/Fediverse/Objects/NoteObject.php
index eee250d344842ff8f8fa52ee777e04e9c6b2ab0e..e9da65d61487ecabccab957caabfca6ceaae441b 100644
--- a/modules/Fediverse/Objects/NoteObject.php
+++ b/modules/Fediverse/Objects/NoteObject.php
@@ -39,6 +39,8 @@ class NoteObject extends ObjectType
         $this->attributedTo = $post->actor->uri;
 
         if ($post->in_reply_to_id !== null) {
+            $this->to[] = $post->reply_to_post->actor->uri;
+
             $this->inReplyTo = $post->reply_to_post->uri;
         }