diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
index d25f1a72..c9b8843f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
@@ -44,6 +44,9 @@ public class AttachmentStore {
     }
 
     public StreamDetails retrieveAttachment(final String id) throws IOException {
+        if (id == null || id.isEmpty()) {
+            throw new IOException("Attachment ID must not be null or empty");
+        }
         final var attachmentFile = new File(attachmentsPath, id);
         return Utils.createStreamDetailsFromFile(attachmentFile);
     }