diff --git a/preview-src/pullRequestOverviewRenderer.ts b/preview-src/pullRequestOverviewRenderer.ts
index 38214e7372..10b5929aa1 100644
--- a/preview-src/pullRequestOverviewRenderer.ts
+++ b/preview-src/pullRequestOverviewRenderer.ts
@@ -463,7 +463,7 @@ export function renderCommit(timelineEvent: CommitEvent): HTMLElement {
 
 	const message: HTMLDivElement = document.createElement('div');
 	message.className = 'message';
-	if (timelineEvent.author.url && timelineEvent.author.avatarUrl) {
+	if (timelineEvent.author && timelineEvent.author.url && timelineEvent.author.avatarUrl) {
 		const userIcon = renderUserIcon(timelineEvent.author.url, timelineEvent.author.avatarUrl);
 		commitMessage.appendChild(userIcon);
 
diff --git a/src/github/queries.gql b/src/github/queries.gql
index a1d9f86867..42b216acba 100644
--- a/src/github/queries.gql
+++ b/src/github/queries.gql
@@ -43,6 +43,10 @@ fragment Commit on Commit {
 			url
 		}
 	}
+	committer {
+		avatarUrl
+		name
+	}
 	url
 	oid
 	message
diff --git a/src/github/utils.ts b/src/github/utils.ts
index 3151b5ba5a..79f6347104 100644
--- a/src/github/utils.ts
+++ b/src/github/utils.ts
@@ -172,7 +172,7 @@ export function parseGraphQLTimelineEvents(events: any[]): TimelineEvent[] {
 
 		if (event.event === EventType.Committed) {
 			event.sha = event.oid;
-			event.author = event.author.user;
+			event.author = event.author.user || { login: event.committer.name, avatarUrl: event.committer.avatarUrl };
 			event.htmlUrl = event.url;
 		}
 	});