diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
index aae9ce6f007151e53f039eb47cdfbb07a1ab0c04..2ca0cd84bc43a48860bea820041ea61185d6cb2f 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
@@ -74,6 +74,7 @@ describe('Kommentar attachments', () => {
 
 		it('should show button for uploading attachments when creating new Kommentar', () => {
 			kommentarContainer.getHinzufuegenButton().click();
+			waitForSpinnerToDisappear();
 
 			exist(attachmentContainer.getUploadInput());
 		});
@@ -102,6 +103,7 @@ describe('Kommentar attachments', () => {
 	describe('Delete attachements', () => {
 		it('should delete attachments', () => {
 			kommentarContainer.getRoot().click();
+			waitForSpinnerToDisappear();
 
 			attachmentList.getItem(TEST_FILE_WITH_CONTENT).getDeleteButton().click();
 			attachmentList.getItem(TEST_FILE_WITHOUT_CONTENT).getDeleteButton().click();
@@ -125,6 +127,8 @@ describe('Kommentar attachments', () => {
 	describe('Download Kommentar attachments', () => {
 		it('should upload attachment', () => {
 			kommentarContainer.getRoot().click();
+			waitForSpinnerToDisappear();
+
 			uploadFile(attachmentContainer.getUploadInput(), TEST_FILE_WITH_CONTENT);
 			waitForSpinnerToDisappear();