diff --git a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
index e944b4cc81..98610f99b7 100644
--- a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
+++ b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
@@ -143,31 +143,31 @@ const ChangesetAuthor: FC<Props> = ({ changeset }) => {
   };
 
   const authorLine = [];
+  if (changeset.author) {
+    authorLine.push(
+      <Persons
+        persons={[changeset.author]}
+        label={"changesets.authors.authoredBy"}
+        displayTextOnly={true}
+      />
+    );
+  }
 
   const commiters = getCommiters();
   if (commiters.length > 0) {
     authorLine.push(<Persons persons={commiters} label={"changesets.authors.committedBy"} />);
-  }
 
+  }
   const coAuthors = getCoAuthors();
   if (coAuthors.length > 0) {
     authorLine.push(<Persons persons={coAuthors} label={"changesets.authors.coAuthoredBy"} />);
-  }
 
+  }
   // extensions
   const extensions = binder.getExtensions("changesets.author.suffix", { changeset });
   if (extensions) {
     coAuthors.push(...extensions);
-  }
 
-  if (changeset.author) {
-    authorLine.unshift(
-      <Persons
-        persons={[changeset.author]}
-        label={"changesets.authors.authoredBy"}
-        displayTextOnly={authorLine.length === 0}
-      />
-    );
   }
 
   return (
diff --git a/scm-ui/ui-components/src/repos/changesets/Changesets.stories.tsx b/scm-ui/ui-components/src/repos/changesets/Changesets.stories.tsx
index bc908d5811..7408e24dc1 100644
--- a/scm-ui/ui-components/src/repos/changesets/Changesets.stories.tsx
+++ b/scm-ui/ui-components/src/repos/changesets/Changesets.stories.tsx
@@ -71,6 +71,9 @@ storiesOf("Changesets", module)
   .add("With avatar", () => {
     return withAvatarFactory(person => hitchhiker, three);
   })
+  .add("Commiter and Co-Authors with avatar", () => {
+    return withAvatarFactory(robohash, one);
+  })
   .add("Co-Authors with avatar", () => {
     return withAvatarFactory(robohash, four);
   });