diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
index 3e40177df06a585c1243886366b7d7ab594eec30..8abe425a3a1187b737bb41c851c1578a8db3e12c 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
@@ -93,7 +93,7 @@ public interface BescheidMapper {
 	}
 
 	default Optional<List<FileId>> mapToAttachments(Object attachments) {
-		if (Objects.isNull(attachments)) {
+		if (Objects.isNull(attachments) || StringUtils.isEmpty(String.valueOf(attachments))) {
 			return Optional.empty();
 		}
 		if (attachments instanceof Collection<?> attachmentList) {
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
index 0abec882c19f1eb715f6ea49929da484945e58f0..8feda3dfe1ac673133247f758d71d3a413fa4a52 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
@@ -7,6 +7,7 @@ import static org.mockito.Mockito.*;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -99,6 +100,13 @@ class BescheidMapperTest {
 
 			assertThat(attachments).hasValue(Collections.singletonList(BescheidTestFactory.ATTACHMENT));
 		}
+
+		@Test
+		void shouldMapEmptyStringToEmptyList() {
+			var attachments = mapper.mapToAttachments(StringUtils.EMPTY);
+
+			assertThat(attachments).isEmpty();
+		}
 	}
 
 	@DisplayName("To get bescheid draft response")