diff --git a/upub/core/src/traits/address.rs b/upub/core/src/traits/address.rs
index fa70d210..d3ddf1fd 100644
--- a/upub/core/src/traits/address.rs
+++ b/upub/core/src/traits/address.rs
@@ -60,12 +60,7 @@ impl Addresser for crate::Context {
 	}
 
 	async fn address_activity(&self, activity: &crate::model::activity::Model, tx: &impl ConnectionTrait) -> Result<(), DbErr> {
-		let mut to = expand_addressing(activity.mentioning(), tx).await?;
-		if !to.iter().any(|x| x == apb::target::PUBLIC)
-			&& activity.addressed().iter().any(|x| x == apb::target::PUBLIC)
-		{
-			to.push(apb::target::PUBLIC.to_string());
-		}
+		let to = expand_addressing(activity.addressed(), tx).await?;
 		address_to(self, to, Some(activity.internal), None, self.is_local(&activity.id), tx).await
 	}
 }