diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
index 0be5ca9f8..ccdf39b10 100644
--- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
+++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
@@ -57,11 +57,11 @@ public abstract class AbstractActionStatusCreate<T> {
     }
 
     public T messages(final Collection<String> messages) {
-        final List<String> newMessages = messages.stream().map(String::strip).toList();
         if (this.messages == null) {
-            this.messages = newMessages;
+            // create modifiable list
+            this.messages = messages.stream().map(String::strip).collect(Collectors.toCollection(ArrayList::new));
         } else {
-            this.messages.addAll(newMessages);
+            this.messages.addAll(messages.stream().map(String::strip).toList());
         }
 
         return (T) this;