diff --git a/plugins/catalog-graphql/src/graphql/module.ts b/plugins/catalog-graphql/src/graphql/module.ts
index 967df97662..3068b3b129 100644
--- a/plugins/catalog-graphql/src/graphql/module.ts
+++ b/plugins/catalog-graphql/src/graphql/module.ts
@@ -50,15 +50,7 @@ export async function createModule(
     },
     CatalogQuery: {
       list: async () => {
-        const catalogEntries = await catalogClient.list();
-        return catalogEntries.map(entity => ({
-          ...entity,
-          metadata: {
-            ...entity.metadata,
-            annotations: entity.metadata.annotations ?? {},
-            labels: entity.metadata.labels ?? {},
-          },
-        }));
+        return await catalogClient.list();
       },
     },
     EntityMetadata: {
diff --git a/plugins/catalog-graphql/src/service/client.ts b/plugins/catalog-graphql/src/service/client.ts
index 05e73b88b8..8af97a89b1 100644
--- a/plugins/catalog-graphql/src/service/client.ts
+++ b/plugins/catalog-graphql/src/service/client.ts
@@ -23,6 +23,8 @@ export interface ReaderEntityMeta extends EntityMeta {
   etag: string;
   generation: number;
   namespace: string;
+  annotations: Record<string, string>;
+  labels: Record<string, string>;
 }
 export interface ReaderEntity extends Entity {
   metadata: JsonObject & ReaderEntityMeta;