diff --git a/packages/server/modules/core/graph/resolvers/versions.ts b/packages/server/modules/core/graph/resolvers/versions.ts
index 5ccd6ae99..ad3113bf4 100644
--- a/packages/server/modules/core/graph/resolvers/versions.ts
+++ b/packages/server/modules/core/graph/resolvers/versions.ts
@@ -17,6 +17,7 @@ export = {
   Version: {
     async authorUser(parent, _args, ctx) {
       const { author } = parent
+      if (!author) return null
       return (await ctx.loaders.users.getUser.load(author)) || null
     },
     async model(parent, _args, ctx) {
diff --git a/packages/server/modules/core/helpers/types.ts b/packages/server/modules/core/helpers/types.ts
index a7139250c..1364dd524 100644
--- a/packages/server/modules/core/helpers/types.ts
+++ b/packages/server/modules/core/helpers/types.ts
@@ -85,7 +85,7 @@ export type ServerInfo = ServerConfigRecord & {
 export type CommitRecord = {
   id: string
   referencedObject: string
-  author: string
+  author: Nullable<string>
   message: Nullable<string>
   createdAt: Date
   sourceApplication: Nullable<string>