diff --git a/scm-ui/ui-components/src/SplitAndReplace.tsx b/scm-ui/ui-components/src/SplitAndReplace.tsx
index a3f72b553f..e1125b2265 100644
--- a/scm-ui/ui-components/src/SplitAndReplace.tsx
+++ b/scm-ui/ui-components/src/SplitAndReplace.tsx
@@ -52,7 +52,13 @@ const SplitAndReplace: FC<Props> = ({ text, replacements }) => {
   if (parts.length === 0) {
     return <>{parts[0]}</>;
   }
-  return <>{parts}</>;
+  return (
+    <>
+      {parts.map((part, index) => (
+        <React.Fragment key={index}>{part}</React.Fragment>
+      ))}
+    </>
+  );
 };
 
 export default SplitAndReplace;
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
index f6caa08c9b..be9a70dfc8 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
@@ -174,8 +174,8 @@ class ChangesetDetails extends React.Component<Props, State> {
     const description = changesets.parseDescription(changeset.description);
     const id = <ChangesetId repository={repository} changeset={changeset} link={false} />;
     const date = <DateFromNow date={changeset.date} />;
-    const parents = changeset._embedded.parents.map((parent: ParentChangeset) => (
-      <ReactLink title={parent.id} to={parent.id}>
+    const parents = changeset._embedded.parents.map((parent: ParentChangeset, index: number) => (
+      <ReactLink title={parent.id} to={parent.id} key={index}>
         {parent.id.substring(0, 7)}
       </ReactLink>
     ));