diff --git a/libervia/backend/plugins/plugin_xep_0084.py b/libervia/backend/plugins/plugin_xep_0084.py
index 33bf1d0a..0e8169bc 100644
--- a/libervia/backend/plugins/plugin_xep_0084.py
+++ b/libervia/backend/plugins/plugin_xep_0084.py
@@ -82,7 +82,7 @@ class XEP_0084:
     async def on_metadata_update(
         self, client: SatXMPPEntity, itemsEvent: pubsub.ItemsEvent
     ) -> None:
-        entity = client.jid.userhostJID()
+        entity = itemsEvent.sender
         avatar_metadata = await self.get_avatar(client, entity)
         await self._i.update(client, IMPORT_NAME, "avatar", avatar_metadata, entity)