diff --git a/packages/ui-avatar/src/components/UserAvatar.tsx b/packages/ui-avatar/src/components/UserAvatar.tsx
index 9945aa2b26b..b4f5ae85a65 100644
--- a/packages/ui-avatar/src/components/UserAvatar.tsx
+++ b/packages/ui-avatar/src/components/UserAvatar.tsx
@@ -31,7 +31,8 @@ const UserAvatar = ({ username, userId, etag, ...rest }: UserAvatarProps) => {
 		return <BaseAvatar url={url} data-username={username} title={username} {...props} />;
 	}
 
-	throw new Error('ui-avatar(UserAvatar) - Either username or userId must be provided');
+	// TODO: We should throw an Error after fixing the issue in Composer passing the username undefined
+	return null;
 };
 
 export default memo(UserAvatar);