diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala
index 98700c60..9856e229 100644
--- a/libdino/src/service/muc_manager.vala
+++ b/libdino/src/service/muc_manager.vala
@@ -212,11 +212,6 @@ public class MucManager : StreamInteractionModule, Object {
         return null;
     }
 
-    public bool has_avatar(Jid muc_jid, Account account) {
-        Gee.List<Jid>? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(muc_jid, account);
-        return full_jids != null && full_jids.contains(muc_jid);
-    }
-
     private Xep.Muc.Flag? get_muc_flag(Account account) {
         XmppStream? stream = stream_interactor.get_stream(account);
         if (stream != null) {
diff --git a/main/src/ui/avatar_image.vala b/main/src/ui/avatar_image.vala
index f690637b..bf6cb9f4 100644
--- a/main/src/ui/avatar_image.vala
+++ b/main/src/ui/avatar_image.vala
@@ -206,7 +206,7 @@ public class AvatarImage : Misc {
             stream_interactor.connection_manager.connection_state_changed.connect(on_connection_changed);
             stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect(on_roster_updated);
         }
-        if (muc_manager.is_groupchat(jid_, account) && !muc_manager.has_avatar(jid_, account)) {
+        if (muc_manager.is_groupchat(jid_, account) && avatar_manager.get_avatar(account, jid_) == null) {
             // Groupchat without avatar
             Gee.List<Jid>? occupants = muc_manager.get_other_occupants(jid_, account);
             jid = jid_;