diff --git a/tools/fetch-changelog/index.js b/tools/fetch-changelog/index.js
index 1a193ced3..cf9bd2e2c 100644
--- a/tools/fetch-changelog/index.js
+++ b/tools/fetch-changelog/index.js
@@ -33,10 +33,10 @@ class MergeChangelog {
         sha: entry.sha,
         url: entry.html_url,
         user: {
-          id: entry.author.id,
-          login: entry.author.login,
-          avatar: entry.author.avatar_url,
-          url: entry.author.html_url,
+          id: entry.author?.id,
+          login: entry.author?.login,
+          avatar: entry.author?.avatar_url,
+          url: entry.author?.html_url,
         },
         commit_date: entry.commit.committer.date,
         message: entry.commit.message,