--- a/plugins/muc/vcard.lib.lua	Mon Sep 08 13:25:53 2025 +0200
+++ b/plugins/muc/vcard.lib.lua	Fri Sep 12 17:05:42 2025 +0200
@@ -10,8 +10,13 @@
 --luacheck: ignore 113/get_room_from_jid
 
 local function get_avatar_hash(room)
+	if room.avatar_hash then return room.avatar_hash; end
+
 	local room_node = jid.split(room.jid);
-	return mod_vcard.get_avatar_hash(room_node);
+	local hash = mod_vcard.get_avatar_hash(room_node);
+	room.avatar_hash = hash;
+
+	return hash;
 end
 
 local function send_avatar_hash(room, to)
@@ -57,11 +62,12 @@
 end, 10);
 
 if advertise_hashes ~= "none" then
-	module:hook("muc-occupant-joined", function (event)
+	module:hook("muc-occupant-session-new", function (event)
 		send_avatar_hash(event.room, event.stanza.attr.from);
 	end);
 	module:hook("vcard-updated", function (event)
 		local room = get_room_from_jid(event.stanza.attr.to);
+		room.avatar_hash = nil;
 		send_avatar_hash(room, nil);
 	end);
 end