diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
index 204d50d913..2aee44c3be 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
@@ -66,6 +66,9 @@ const ContributorTable: FC<Props> = ({ changeset }) => {
   const [t] = useTranslation("plugins");
 
   const collectAvailableContributorTypes = () => {
+    if (!changeset.contributors) {
+      return [];
+    }
     // @ts-ignore
     return [...new Set(changeset.contributors.map(contributor => contributor.type))];
   };
@@ -97,7 +100,7 @@ const ContributorTable: FC<Props> = ({ changeset }) => {
           <SizedTd>{t("changeset.contributor.type." + contributor.type)}:</SizedTd>
           <td className="is-ellipsis-overflow is-marginless">
             <CommaSeparatedList>
-              {contributor.persons.map(person => (
+              {contributor.persons!.map(person => (
                 <Contributor key={person.name} person={person} />
               ))}
             </CommaSeparatedList>