diff --git a/scm-ui/ui-components/src/repos/changesets/ChangesetRow.tsx b/scm-ui/ui-components/src/repos/changesets/ChangesetRow.tsx
index 43ff97d20c..d83ddff9fb 100644
--- a/scm-ui/ui-components/src/repos/changesets/ChangesetRow.tsx
+++ b/scm-ui/ui-components/src/repos/changesets/ChangesetRow.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Trans, WithTranslation, withTranslation } from "react-i18next";
+import { Trans } from "react-i18next";
 import classNames from "classnames";
 import styled from "styled-components";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
@@ -12,7 +12,7 @@ import ChangesetAuthor from "./ChangesetAuthor";
 import ChangesetTags from "./ChangesetTags";
 import ChangesetButtonGroup from "./ChangesetButtonGroup";
 
-type Props = WithTranslation & {
+type Props = {
   repository: Repository;
   changeset: Changeset;
 };
@@ -95,10 +95,10 @@ class ChangesetRow extends React.Component<Props> {
                       </ExtensionPoint>
                     </h4>
                     <p className="is-hidden-touch">
-                      <Trans i18nKey="changeset.summary" values={{ id: changesetId, time: dateFromNow }} />
+                      <Trans i18nKey="repos:changeset.summary" components={[changesetId, dateFromNow]} />
                     </p>
                     <p className="is-hidden-desktop">
-                      <Trans i18nKey="changeset.shortSummary" values={{ id: changesetId, time: dateFromNow }} />
+                      <Trans i18nKey="repos:changeset.shortSummary" components={[changesetId, dateFromNow]} />
                     </p>
                     <AuthorWrapper className="is-size-7">
                       <ChangesetAuthor changeset={changeset} />
@@ -128,4 +128,4 @@ class ChangesetRow extends React.Component<Props> {
   }
 }
 
-export default withTranslation("repos")(ChangesetRow);
+export default ChangesetRow;
diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json
index cec34319ab..9abd686452 100644
--- a/scm-ui/ui-webapp/public/locales/de/repos.json
+++ b/scm-ui/ui-webapp/public/locales/de/repos.json
@@ -78,8 +78,8 @@
   },
   "changeset": {
     "description": "Beschreibung",
-    "summary": "Changeset {{id}} wurde committet {{time}}",
-    "shortSummary": "Committet {{id}} {{time}}",
+    "summary": "Changeset <0/> wurde committet <1/>",
+    "shortSummary": "Committet <0/> <1/>",
     "tags": "Tags",
     "diffNotSupported": "Diff des Changesets wird von diesem Repositorytyp nicht unterstützt",
     "author": {
diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json
index 76d21aa679..d621bad7bf 100644
--- a/scm-ui/ui-webapp/public/locales/en/repos.json
+++ b/scm-ui/ui-webapp/public/locales/en/repos.json
@@ -78,8 +78,8 @@
   },
   "changeset": {
     "description": "Description",
-    "summary": "Changeset {{id}} was committed {{time}}",
-    "shortSummary": "Committed {{id}} {{time}}",
+    "summary": "Changeset <0/> was committed <1/>",
+    "shortSummary": "Committed <0/> <1/>",
     "tags": "Tags",
     "diffNotSupported": "Diff of changesets is not supported by the type of repository",
     "author": {
diff --git a/scm-ui/ui-webapp/public/locales/es/repos.json b/scm-ui/ui-webapp/public/locales/es/repos.json
index efcbdd8c2e..8372c7e592 100644
--- a/scm-ui/ui-webapp/public/locales/es/repos.json
+++ b/scm-ui/ui-webapp/public/locales/es/repos.json
@@ -78,8 +78,8 @@
   },
   "changeset": {
     "description": "Descripción",
-    "summary": "El changeset {{id}} fue entregado {{time}}",
-    "shortSummary": "Entregado {{id}} {{time}}",
+    "summary": "El changeset <0/> fue entregado <1/>",
+    "shortSummary": "Entregado <0/> <1/>",
     "tags": "Etiquetas",
     "diffNotSupported": "La comparación de changesets no es soportada por el tipo de repositorio",
     "author": {
diff --git a/scm-ui/ui-webapp/src/i18n.ts b/scm-ui/ui-webapp/src/i18n.ts
index b46185ced6..f7dc75d910 100644
--- a/scm-ui/ui-webapp/src/i18n.ts
+++ b/scm-ui/ui-webapp/src/i18n.ts
@@ -30,7 +30,8 @@ i18n
     },
 
     react: {
-      wait: true
+      wait: true,
+      useSuspense: false
     },
 
     backend: {