diff --git a/packages/pl-api/lib/entities/account.ts b/packages/pl-api/lib/entities/account.ts
index 313a99699..0fbb73083 100644
--- a/packages/pl-api/lib/entities/account.ts
+++ b/packages/pl-api/lib/entities/account.ts
@@ -28,8 +28,8 @@ const preprocessAccount = v.transform((account: any) => {
     username,
     fqn,
     domain,
-    avatar_static: account.avatar_static || account.avatar,
-    header_static: account.header_static || account.header,
+    avatar: account.avatar || account.avatar_static,
+    header: account.header || account.header_static,
     local: typeof account.pleroma?.is_local === 'boolean' ? account.pleroma.is_local : account.acct.split('@')[1] === undefined,
     discoverable: account.discoverable || account.pleroma?.source?.discoverable,
     verified: account.verified || account.pleroma?.tags?.includes('verified'),
diff --git a/packages/pl-api/lib/entities/group.ts b/packages/pl-api/lib/entities/group.ts
index 647d271d0..4825da0b6 100644
--- a/packages/pl-api/lib/entities/group.ts
+++ b/packages/pl-api/lib/entities/group.ts
@@ -13,8 +13,7 @@ const groupSchema = v.pipe(v.any(), v.transform((group: any) => {
   const domain = getDomainFromURL(group);
 
   if (group?.config) {
-    return {
-      domain,
+    group = {
       display_name: group.name,
       members_count: group.member_count,
       note: group.short_description,
@@ -30,7 +29,13 @@ const groupSchema = v.pipe(v.any(), v.transform((group: any) => {
       ...group,
     };
   }
-  return { domain, ...group };
+
+  return {
+    domain,
+    ...group,
+    avatar: group.avatar || group.avatar_static,
+    header: group.header || group.header_static,
+  };
 }), v.object({
   avatar: v.fallback(v.string(), ''),
   avatar_static: v.fallback(v.string(), ''),