diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 0dc7f5edb..4e6bee908 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -764,11 +764,12 @@ private void applyMessage(
             messageBuilder.withBody(message.messageText());
         }
         if (!message.attachments().isEmpty()) {
+            final var uploadedAttachments = context.getAttachmentHelper().uploadAttachments(message.attachments());
             if (!additionalAttachments.isEmpty()) {
-                additionalAttachments.addAll(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                additionalAttachments.addAll(uploadedAttachments);
                 messageBuilder.withAttachments(additionalAttachments);
             } else {
-                messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                messageBuilder.withAttachments(uploadedAttachments);
             }
         }
         if (!message.mentions().isEmpty()) {