diff --git a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
index fa9b70e38fdd6f794beb4c422d08d03356e66b17..adf5bb79d4d9e1fc9c0aa2602fa95d859d0fc35b 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
@@ -56,6 +56,7 @@ describe('Vorgang Zurueckholen', () => {
   };
 
   before(() => {
+    dropCollections();
     initVorgaenge([vorgangZurueckholen, vorgangZurueckholenRevoke]);
 
     loginAsEmil();
@@ -146,6 +147,7 @@ describe('Vorgang Zurueckholen', () => {
 
       it('should show status Verworfen after progressbar dissapear', () => {
         notExist(vorgangPage.getProgressBar());
+        waitForSpinnerToDisappear();
 
         haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN]);
       });
diff --git a/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts b/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
index 299d28b5a0c7add1949f11fb6f45423b40925306..f9c6a11705a56aa786e77d80200b1ee867f8c7a8 100644
--- a/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
+++ b/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
@@ -96,7 +96,7 @@ export class MainPage {
 }
 
 export function waitForSpinnerToDisappear(): boolean {
-  return cy.getTestElementWithClass('spinner-content').should('not.exist');
+  return cy.getTestElementWithClass('spinner').should('not.exist');
 }
 
 export function waitforSpinnerToAppear(): void {
diff --git a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
index 7d747d7685124129b52a1069467600538a464aa0..7218921767e09a8314129dea4602dc899ed39b70 100644
--- a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
@@ -23,8 +23,8 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<div *ngIf="showSpinner" data-test-class="spinner" class="spinner" [style.padding]="padding + 'px'">
-  <mat-spinner [diameter]="diameter"></mat-spinner>
+<div *ngIf="showSpinner" class="spinner" [style.padding]="padding + 'px'">
+  <mat-spinner [diameter]="diameter" data-test-class="spinner"> </mat-spinner>
   <span *ngIf="text">{{ text }}</span>
 </div>