diff --git a/packages/moxxmpp/lib/src/xeps/xep_0084.dart b/packages/moxxmpp/lib/src/xeps/xep_0084.dart
index 7d865b8..030eb67 100644
--- a/packages/moxxmpp/lib/src/xeps/xep_0084.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0084.dart
@@ -147,10 +147,11 @@ class UserAvatarManager extends XmppManagerBase {
       return Result(UnknownAvatarError());
     }
 
-    final metadata = results.first.payload
-        .firstTag('metadata', xmlns: userAvatarMetadataXmlns)!;
     return Result(
-      metadata.findTags('info').map(UserAvatarMetadata.fromXML).toList(),
+      results.first.payload
+          .findTags('info')
+          .map(UserAvatarMetadata.fromXML)
+          .toList(),
     );
   }