diff --git a/scm-ui/src/repos/components/changesets/ChangesetList.js b/scm-ui/src/repos/components/changesets/ChangesetList.js
index 1eaae67ff0..860b7ba8b0 100644
--- a/scm-ui/src/repos/components/changesets/ChangesetList.js
+++ b/scm-ui/src/repos/components/changesets/ChangesetList.js
@@ -12,10 +12,10 @@ type Props = {
 class ChangesetList extends React.Component<Props> {
   render() {
     const { repository, changesets } = this.props;
-    const content = changesets.map((changeset, index) => {
+    const content = changesets.map(changeset => {
       return (
         <ChangesetRow
-          key={index}
+          key={changeset.id}
           repository={repository}
           changeset={changeset}
         />
diff --git a/scm-ui/src/repos/components/changesets/ChangesetRow.js b/scm-ui/src/repos/components/changesets/ChangesetRow.js
index 09caedb433..a1a497ad67 100644
--- a/scm-ui/src/repos/components/changesets/ChangesetRow.js
+++ b/scm-ui/src/repos/components/changesets/ChangesetRow.js
@@ -9,6 +9,7 @@ import injectSheet from "react-jss";
 import { DateFromNow } from "@scm-manager/ui-components";
 import ChangesetAuthor from "./ChangesetAuthor";
 import ChangesetTag from "./ChangesetTag";
+import { compose } from "redux";
 
 const styles = {
   pointer: {
@@ -74,7 +75,7 @@ class ChangesetRow extends React.Component<Props> {
       return (
         <div className="media-right">
           {tags.map((tag: Tag) => {
-            return <ChangesetTag tag={tag} />;
+            return <ChangesetTag key={tag.name} tag={tag} />;
           })}
         </div>
       );
@@ -83,4 +84,7 @@ class ChangesetRow extends React.Component<Props> {
   };
 }
 
-export default injectSheet(styles)(translate("repos")(ChangesetRow));
+export default compose(
+  injectSheet(styles),
+  translate("repos")
+)(ChangesetRow);