diff --git a/src/client/webapp/elements/lists/components/message-element.tsx b/src/client/webapp/elements/lists/components/message-element.tsx
index 5eb86c9..9429d95 100644
--- a/src/client/webapp/elements/lists/components/message-element.tsx
+++ b/src/client/webapp/elements/lists/components/message-element.tsx
@@ -111,14 +111,11 @@ const MessageElement: FC<MessageElementProps> = (props: MessageElementProps) =>
 		[message, prevMessage],
 	);
 
-	const [avatarSrc] = useOneTimeAsyncAction(
-		async () => {
-			if (message.isContinued(prevMessage)) return './img/loading.svg'; // don't load for elements that won't use it
-			if (!(message.member instanceof Member)) return './img/error.png'; // TODO: Make this a nicer 'unknown' image
-			return await ElementsUtil.getImageSrcFromResourceFailSoftly(guild, message.member.avatarResourceId);
-		},
-		'./img/loading.svg',
-		[message],
+	const avatarSrc = useRecoilValueSoftImgSrc(
+		guildResourceSoftImgSrcState({
+			guildId: guild.id,
+			resourceId: message.member instanceof Member ? message.member.avatarResourceId : null,
+		}),
 	);
 
 	const dateSpacer = useMemo(() => {