diff --git a/web/src/api/media.ts b/web/src/api/media.ts
index 2d61ac4..028ab6f 100644
--- a/web/src/api/media.ts
+++ b/web/src/api/media.ts
@@ -81,13 +81,7 @@ function getFallbackCharacter(from: unknown, idx: number): string {
 export const getAvatarURL = (userID: UserID, content?: UserProfile | null): string | undefined => {
 	const fallbackCharacter = getFallbackCharacter(content?.displayname, 0) || getFallbackCharacter(userID, 1)
 	const backgroundColor = getUserColor(userID)
-	let server: string | undefined
-	let mediaID: string | undefined
-	if (content?.avatar_file) {
-		[server, mediaID] = parseMXC(content.avatar_file.url)
-	} else {
-		[server, mediaID] = parseMXC(content?.avatar_url)
-	}
+	const [server, mediaID] = parseMXC(content?.avatar_file?.url ?? content?.avatar_url)
 	if (!mediaID) {
 		return makeFallbackAvatar(backgroundColor, fallbackCharacter)
 	}