diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php
index b62c51268..c7328db38 100644
--- a/app/Jobs/SharePipeline/SharePipeline.php
+++ b/app/Jobs/SharePipeline/SharePipeline.php
@@ -61,7 +61,12 @@ class SharePipeline implements ShouldQueue
                   ->whereItemType('App\Status')
                   ->count();
 
-        if ($target->id === $status->profile_id || $exists !== 0) {
+        if ($target->id === $status->profile_id) {
+            $this->remoteAnnounceDeliver();
+            return true;
+        }
+
+        if( $exists !== 0) {
             return true;
         }
 
@@ -88,6 +93,9 @@ class SharePipeline implements ShouldQueue
 
     public function remoteAnnounceDeliver()
     {
+        if(config('federation.activitypub.enabled') == false) {
+            return true;
+        }
         $status = $this->status;
         $profile = $status->profile;