diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index c4c77b34..f64ace9b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -172,7 +172,9 @@ public class Manager implements Closeable {
                 executor,
                 sessionLock);
         final var avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
-        final var attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
+        final var attachmentStore = new AttachmentStore(new File(pathConfig.getAttachmentsPath(),
+                account.getUsername()));
+
         final var stickerPackStore = new StickerPackStore(pathConfig.getStickerPacksPath());
 
         this.attachmentHelper = new AttachmentHelper(dependencies, attachmentStore);