diff --git a/source/app/mocks/api/github/graphql/base.user.mjs b/source/app/mocks/api/github/graphql/base.user.mjs
index bd1f762f..19edc87e 100644
--- a/source/app/mocks/api/github/graphql/base.user.mjs
+++ b/source/app/mocks/api/github/graphql/base.user.mjs
@@ -11,7 +11,7 @@ export default function({faker, query, login = faker.internet.userName()}) {
       websiteUrl:faker.internet.url(),
       isHireable:faker.datatype.boolean(),
       twitterUsername:login,
-      repositories:{totalCount:faker.datatype.number(100), totalDiskUsage:faker.datatype.number(100000), nodes:[]},
+      repositories:{totalCount:faker.datatype.number(100), totalDiskUsage:faker.datatype.number(100000)},
       packages:{totalCount:faker.datatype.number(10)},
       starredRepositories:{totalCount:faker.datatype.number(1000)},
       watching:{totalCount:faker.datatype.number(100)},
diff --git a/source/plugins/base/index.mjs b/source/plugins/base/index.mjs
index 703791b6..9d2a50db 100644
--- a/source/plugins/base/index.mjs
+++ b/source/plugins/base/index.mjs
@@ -37,6 +37,7 @@ export default async function({login, graphql, rest, data, q, queries, imports},
         let cursor = null
         let pushed = 0
         const options = {repositories:{forks, affiliations, constraints:""}, repositoriesContributedTo:{forks:"", affiliations:"", constraints:", includeUserRepositories: false, contributionTypes: COMMIT"}}[type] ?? null
+        data.user[type].nodes = data.user[type].nodes ?? []
         do {
           console.debug(`metrics/compute/${login}/base > retrieving ${type} after ${cursor}`)
           const {[account]:{[type]:{edges = [], nodes = []} = {}}} = await graphql(queries.base.repositories({login, account, type, after:cursor ? `after: "${cursor}"` : "", repositories:Math.min(repositories, {user:_batch, organization:Math.min(25, _batch)}[account]), ...options}))
diff --git a/source/plugins/base/queries/organization.graphql b/source/plugins/base/queries/organization.graphql
index 3c3996a2..3339e897 100644
--- a/source/plugins/base/queries/organization.graphql
+++ b/source/plugins/base/queries/organization.graphql
@@ -12,9 +12,6 @@ query BaseOrganization {
     repositories(last: 0) {
       totalCount
       totalDiskUsage
-      nodes {
-        name
-      }
     }
     packages {
       totalCount
diff --git a/source/plugins/base/queries/user.graphql b/source/plugins/base/queries/user.graphql
index 2f3f63c4..ada9b190 100644
--- a/source/plugins/base/queries/user.graphql
+++ b/source/plugins/base/queries/user.graphql
@@ -12,9 +12,6 @@ query BaseUser {
     repositories(last: 0 $forks $affiliations) {
       totalCount
       totalDiskUsage
-      nodes {
-        name
-      }
     }
     packages {
       totalCount