diff --git a/src/Model/Item.php b/src/Model/Item.php
index ca5e4bec0..07ae42d4a 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -949,7 +949,9 @@ class Item
 			$item['parent'] = $parent_id;
 
 			// Trigger automatic reactions for addons
-			$item['api_source'] = true;
+			if (!isset($item['api_source'])) {
+				$item['api_source'] = true;
+			}
 
 			// We have to tell the hooks who we are - this really should be improved
 			if (!local_user()) {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 5caa6c7a1..3ddd5d663 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -4100,6 +4100,9 @@ class Diaspora
 			$item['private'] = Item::PUBLIC;
 		}
 
+		// Don't trigger the addons
+		$item['api_source'] = false;
+
 		return Item::insert($item, true);
 	}
 }