diff --git a/src/chat/chat_profile.c b/src/chat/chat_profile.c
index 4cbccb93..a3a02d2e 100644
--- a/src/chat/chat_profile.c
+++ b/src/chat/chat_profile.c
@@ -189,7 +189,7 @@ void chat_core_update_my_member(struct UTUN_INSTANCE* inst) {
 }
 
 int chat_core_set_my_avatar(struct UTUN_INSTANCE* inst, const char* ch_id, uint64_t server, const char* file) {
-    if (!inst || !ch_id || !file || (server && (strlen(file) != 68 || strcmp(file + 64, ".png")))) {
+    if (!inst || !ch_id || !file || (server && !mf_avatar_manifest_valid(file))) {
         DEBUG_WARN(DEBUG_CATEGORY_CHAT, "profile: invalid avatar reference"); return -1;
     }
     if (server) {