diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
index b1e2a4cffe..f92d0d6e99 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import de.otto.edison.hal.HalRepresentation;
+import org.mapstruct.Mapping;
 import sonia.scm.ModelObject;
 import sonia.scm.util.AssertUtil;
 
@@ -9,6 +10,8 @@ import java.util.Optional;
 
 abstract class BaseMapper<T extends ModelObject, D extends HalRepresentation> {
 
+
+  @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract D map(T user);
 
   Instant mapTime(Long epochMilli) {