diff --git a/mod/pubsub.php b/mod/pubsub.php
index d6e3d378fc..4dff5d531a 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -122,6 +122,12 @@ function pubsub_post(&$a) {
 
 	$contact = $r[0];
 
+	// we have no way to match Diaspora guid's with atom post id's and could get duplicates.
+	// we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
+
+	if($r[0]['network'] === NETWORK_DIASPORA)
+		hub_post_return();
+
 	$feedhub = '';
 
 	require_once('include/items.php');