diff --git a/packages/app/src/Element/BadgeList.tsx b/packages/app/src/Element/BadgeList.tsx
index 53ecd4f2..58c0b6b0 100644
--- a/packages/app/src/Element/BadgeList.tsx
+++ b/packages/app/src/Element/BadgeList.tsx
@@ -23,7 +23,7 @@ export default function BadgeList({ badges }: { badges: TaggedRawEvent[] }) {
       pubkey: b.pubkey,
       name,
       description,
-      img: thumb || image,
+      img: thumb?.length > 0 ? thumb : image,
     };
   });
   return (
diff --git a/packages/app/src/Pages/ProfilePage.tsx b/packages/app/src/Pages/ProfilePage.tsx
index 51905a86..d56d4f71 100644
--- a/packages/app/src/Pages/ProfilePage.tsx
+++ b/packages/app/src/Pages/ProfilePage.tsx
@@ -79,7 +79,6 @@ export default function ProfilePage() {
   const website_url =
     user?.website && !user.website.startsWith("http") ? "https://" + user.website : user?.website || "";
   // feeds
-  const badges = useProfileBadges(id);
   const { blocked } = useModeration();
   const { notes: pinned, related: pinRelated } = usePinnedFeed(id);
   const { notes: bookmarks, related: bookmarkRelated } = useBookmarkFeed(id);
@@ -89,6 +88,7 @@ export default function ProfilePage() {
   const followers = useFollowersFeed(id);
   const follows = useFollowsFeed(id);
   const muted = useMutedFeed(id);
+  const badges = useProfileBadges(id);
   // tabs
   const ProfileTab = {
     Notes: { text: formatMessage(messages.Notes), value: NOTES },