diff --git a/scm-core/src/main/java/sonia/scm/repository/Changeset.java b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
index 5b5b1f2e5b..e00480bc6a 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Changeset.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
@@ -311,7 +311,14 @@ public class Changeset extends BasicPropertiesAware implements ModelObject {
   }
 
   public void setTrailers(Collection<Trailer> trailers) {
-    this.trailers = trailers;
+    this.trailers = new ArrayList<>(trailers);
+  }
+
+  public void addTrailer(Trailer trailer) {
+    if (trailers == null) {
+      trailers = new ArrayList<>();
+    }
+    trailers.add(trailer);
   }
 
   public void addTrailers(Collection<Trailer> trailers) {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
index 51c18449f2..0dca45aa35 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
@@ -182,7 +182,7 @@ public class GitChangesetConverter implements Closeable
 
     Changeset changeset = new Changeset(id, date, author, message);
     if (!committerIdent.equals(authorIndent)) {
-      changeset.addTrailers(Collections.singleton(new Trailer("Committed-by", createPersonFor(committerIdent))));
+      changeset.addTrailer(new Trailer("Committed-by", createPersonFor(committerIdent)));
     }
 
     if (parentList != null)