diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java
index 7de07477e..9b7a84db6 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java
@@ -227,7 +227,7 @@ public class AttachmentSummaryImpl implements AttachmentSummary {
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append("AttachmentImpl [id=");
+        builder.append("AttachmentSummaryImpl [id=");
         builder.append(id);
         builder.append(", taskId=");
         builder.append(taskId);
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java
index e018a4d40..14377f973 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java
@@ -38,7 +38,7 @@ public class TaskSummaryImpl implements TaskSummary {
     private boolean isRead;
     private boolean isTransferred;
     // All objects have to be serializable
-    private List<AttachmentSummary> attachmentSummaries;
+    private List<AttachmentSummary> attachmentSummaries = new ArrayList<>();
     private String custom1;
     private String custom2;
     private String custom3;
diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java
index 6feddbab5..981e7e055 100644
--- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java
@@ -3,6 +3,7 @@ package acceptance.task;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -57,7 +58,19 @@ public class QueryTaskWithAttachment extends AbstractAccTest {
         assertEquals(20, tasks.size());
 
         List<AttachmentSummary> attachmentSummaries = tasks.get(0).getAttachmentSummaries();
-        assertEquals(null, attachmentSummaries);
+        assertNotNull(attachmentSummaries);
+        assertTrue(attachmentSummaries.isEmpty());
+    }
+
+    @WithAccessId(
+            userName = "user_1_1",
+            groupNames = {"group_1"})
+    @Test
+    public void testIfNewTaskHasEmptyAttachmentList() {
+        TaskService taskService = taskanaEngine.getTaskService();
+        Task task = taskService.newTask("WBI:100000000000000000000000000000000006");
+        assertNotNull(task.getAttachments());
+        assertNotNull(task.asSummary().getAttachmentSummaries());
     }
 
     @WithAccessId(