diff --git a/lib/postzord/dispatch.rb b/lib/postzord/dispatch.rb
index cb99b3635..c3390a75b 100644
--- a/lib/postzord/dispatch.rb
+++ b/lib/postzord/dispatch.rb
@@ -35,7 +35,7 @@ class Postzord::Dispatch
         self.deliver_to_local(local_people)
       end
 
-      self.deliver_to_remote(remote_people)
+      self.deliver_to_remote(remote_people) unless @sender.username == 'diasporahq' #NOTE: 09/08/11 this is temporary (~3days max) till we fix fanout in federation
     end
     self.deliver_to_services(opts[:url], opts[:services] || [])
     @object.after_dispatch(@sender)
@@ -86,6 +86,7 @@ class Postzord::Dispatch
     socket_to_users(users)
   end
 
+
   def notify_users(users)
     Resque.enqueue(Job::NotifyLocalUsers, users.map{|u| u.id}, @object.class.to_s, @object.id, @object.author.id)
   end