diff --git a/lib/common.rb b/lib/common.rb
index 4a64c570c..38d8c416f 100644
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -8,9 +8,11 @@ module Diaspora
         @@queue = MessageHandler.new
         
         def notify_friends
-          xml = Post.build_xml_for(self)
-          @@queue.add_post_request( friends_with_permissions, xml )
-          @@queue.process
+         if self.owner == User.first.email
+            xml = Post.build_xml_for(self)
+            @@queue.add_post_request( friends_with_permissions, xml )
+            @@queue.process
+          end
         end
         
         def prep_webhook