diff --git a/lib/diaspora/federated/retraction.rb b/lib/diaspora/federated/retraction.rb
index e3e7824b6..81c34d04e 100644
--- a/lib/diaspora/federated/retraction.rb
+++ b/lib/diaspora/federated/retraction.rb
@@ -26,11 +26,11 @@ class Retraction
                               Diaspora::Federation::Entities.retraction(target)
                             end
 
-    new(federation_retraction.to_h, target.subscribers, target)
+    new(federation_retraction.to_h, target.subscribers.select(&:remote?), target)
   end
 
   def defer_dispatch(user)
-    Workers::DeferredRetraction.perform_async(user.id, data, subscribers.map(&:id))
+    Workers::DeferredRetraction.perform_async(user.id, data, subscribers.map(&:id)) unless subscribers.empty?
   end
 
   def perform