diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
index 3394e79e00..487abc8be4 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
@@ -110,7 +110,7 @@
                 entity: rec.record,
                 operation: 'delete'
               }"
-              (click)="delete(rec)"
+              (click)="entityRemoveService.remove(rec.record)"
               angulartics2On="click"
               [angularticsCategory]="rec?.record?.getType()"
               angularticsAction="subrecord_inlineedit_delete"
diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
index 3a31468442..e63338eb51 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
@@ -24,10 +24,7 @@ import {
 } from "../../entity-form/entity-form.service";
 import { LoggingService } from "../../../logging/logging.service";
 import { AnalyticsService } from "../../../analytics/analytics.service";
-import {
-  EntityRemoveService,
-  RemoveResult,
-} from "../../../entity/entity-remove.service";
+import { EntityRemoveService } from "../../../entity/entity-remove.service";
 import { EntityMapperService } from "../../../entity/entity-mapper/entity-mapper.service";
 import { tableSort } from "./table-sort";
 import {
@@ -166,7 +163,7 @@ export class EntitySubrecordComponent<T extends Entity> implements OnChanges {
     private router: Router,
     private analyticsService: AnalyticsService,
     private loggingService: LoggingService,
-    private entityRemoveService: EntityRemoveService,
+    public entityRemoveService: EntityRemoveService,
     private entityMapper: EntityMapperService,
     private filterService: FilterService,
   ) {
@@ -388,28 +385,6 @@ export class EntitySubrecordComponent<T extends Entity> implements OnChanges {
     row.formGroup = null;
   }
 
-  /**
-   * Delete the given entity from the database (after explicit user confirmation).
-   * @param row The entity to be deleted.
-   */
-  delete(row: TableRow<T>) {
-    this.entityRemoveService
-      .remove(row.record, {
-        deletedEntityInformation: $localize`:Record deleted info:Record deleted`,
-        dialogText: $localize`:Delete confirmation message:Are you sure you want to delete this record?`,
-      })
-      .subscribe((result) => {
-        switch (result) {
-          case RemoveResult.REMOVED:
-            this.removeFromDataTable(row.record);
-            break;
-          case RemoveResult.UNDONE:
-            this.records.unshift(row.record);
-            this.initFormGroups();
-        }
-      });
-  }
-
   private removeFromDataTable(deleted: T) {
     // use setter so datasource is also updated
     this.records = this.records.filter(
diff --git a/src/app/core/entity-details/entity-details/entity-details.component.html b/src/app/core/entity-details/entity-details/entity-details.component.html
index 58b3b4f011..9c03c4f7fe 100644
--- a/src/app/core/entity-details/entity-details/entity-details.component.html
+++ b/src/app/core/entity-details/entity-details/entity-details.component.html
@@ -41,7 +41,7 @@
 <mat-menu #additional>
   <button
     mat-menu-item
-    (click)="removeEntity()"
+    (click)="entityRemoveService.remove(entity, true)"
     *appDisabledEntityOperation="{
       entity: entity,
       operation: 'delete'
diff --git a/src/app/core/entity-details/entity-details/entity-details.component.spec.ts b/src/app/core/entity-details/entity-details/entity-details.component.spec.ts
index d3a75c0045..796b31eb03 100644
--- a/src/app/core/entity-details/entity-details/entity-details.component.spec.ts
+++ b/src/app/core/entity-details/entity-details/entity-details.component.spec.ts
@@ -12,10 +12,7 @@ import { EntityDetailsConfig, PanelConfig } from "../EntityDetailsConfig";
 import { Child } from "../../../child-dev-project/children/model/child";
 import { ChildrenService } from "../../../child-dev-project/children/children.service";
 import { MockedTestingModule } from "../../../utils/mocked-testing.module";
-import {
-  EntityRemoveService,
-  RemoveResult,
-} from "../../entity/entity-remove.service";
+import { EntityRemoveService } from "../../entity/entity-remove.service";
 import { EntityAbility } from "../../permissions/ability/entity-ability";
 import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.service";
 
@@ -129,32 +126,6 @@ describe("EntityDetailsComponent", () => {
     expect(component.isLoading).toBeFalse();
   }));
 
-  it("should navigate back when deleting an entity", fakeAsync(() => {
-    const mockRemoveResult = of(RemoveResult.REMOVED);
-    mockEntityRemoveService.remove.and.returnValue(mockRemoveResult);
-    component.entity = new Child("Test-Child");
-    // @ts-ignore
-    const routerNavigateSpy = spyOn(component.router, "navigate");
-
-    component.removeEntity();
-    tick();
-
-    expect(routerNavigateSpy).toHaveBeenCalled();
-  }));
-
-  it("should route back when deleting is undone", fakeAsync(() => {
-    const mockResult = of(RemoveResult.REMOVED, RemoveResult.UNDONE);
-    mockEntityRemoveService.remove.and.returnValue(mockResult);
-    component.entity = new Child("Test-Child");
-    const router = fixture.debugElement.injector.get(Router);
-    spyOn(router, "navigate");
-
-    component.removeEntity();
-    tick();
-
-    expect(router.navigate).toHaveBeenCalled();
-  }));
-
   it("should call router when user is not permitted to create entities", () => {
     mockAbility.cannot.and.returnValue(true);
     const router = fixture.debugElement.injector.get(Router);
diff --git a/src/app/core/entity-details/entity-details/entity-details.component.ts b/src/app/core/entity-details/entity-details/entity-details.component.ts
index 8f9f653819..462543b54b 100644
--- a/src/app/core/entity-details/entity-details/entity-details.component.ts
+++ b/src/app/core/entity-details/entity-details/entity-details.component.ts
@@ -8,13 +8,9 @@ import {
 } from "../EntityDetailsConfig";
 import { Entity, EntityConstructor } from "../../entity/model/entity";
 import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.service";
-import { getUrlWithoutParams } from "../../../utils/utils";
 import { RouteData } from "../../config/dynamic-routing/view-config.interface";
 import { AnalyticsService } from "../../analytics/analytics.service";
-import {
-  EntityRemoveService,
-  RemoveResult,
-} from "../../entity/entity-remove.service";
+import { EntityRemoveService } from "../../entity/entity-remove.service";
 import { EntityAbility } from "../../permissions/ability/entity-ability";
 import { RouteTarget } from "../../../app.routing";
 import { EntityRegistry } from "../../entity/database-entity.decorator";
@@ -75,7 +71,7 @@ export class EntityDetailsComponent {
     private route: ActivatedRoute,
     private router: Router,
     private analyticsService: AnalyticsService,
-    private entityRemoveService: EntityRemoveService,
+    public entityRemoveService: EntityRemoveService,
     private ability: EntityAbility,
     private entities: EntityRegistry,
     private logger: LoggingService,
@@ -152,20 +148,6 @@ export class EntityDetailsComponent {
     return panelConfig;
   }
 
-  removeEntity() {
-    const currentUrl = getUrlWithoutParams(this.router);
-    const parentUrl = currentUrl.substring(0, currentUrl.lastIndexOf("/"));
-    this.entityRemoveService.remove(this.entity).subscribe(async (result) => {
-      switch (result) {
-        case RemoveResult.REMOVED:
-          await this.router.navigate([parentUrl]);
-          break;
-        case RemoveResult.UNDONE:
-          await this.router.navigate([currentUrl]);
-      }
-    });
-  }
-
   trackTabChanged(index: number) {
     this.analyticsService.eventTrack("details_tab_changed", {
       category: this.config?.entity,
diff --git a/src/app/core/entity/entity-remove.service.spec.ts b/src/app/core/entity/entity-remove.service.spec.ts
index e21e32560b..2f9fa7b62f 100644
--- a/src/app/core/entity/entity-remove.service.spec.ts
+++ b/src/app/core/entity/entity-remove.service.spec.ts
@@ -1,5 +1,5 @@
-import { TestBed } from "@angular/core/testing";
-import { EntityRemoveService, RemoveResult } from "./entity-remove.service";
+import { fakeAsync, TestBed, tick } from "@angular/core/testing";
+import { EntityRemoveService } from "./entity-remove.service";
 import { EntityMapperService } from "./entity-mapper/entity-mapper.service";
 import {
   MatSnackBar,
@@ -9,8 +9,8 @@ import {
 } from "@angular/material/snack-bar";
 import { ConfirmationDialogService } from "../common-components/confirmation-dialog/confirmation-dialog.service";
 import { Entity } from "./model/entity";
-import { NEVER, Observable } from "rxjs";
-import { toArray } from "rxjs/operators";
+import { NEVER, Observable, Subject } from "rxjs";
+import { Router } from "@angular/router";
 
 describe("EntityRemoveService", () => {
   let service: EntityRemoveService;
@@ -18,6 +18,7 @@ describe("EntityRemoveService", () => {
   let snackBarSpy: jasmine.SpyObj<MatSnackBar>;
   let mockSnackBarRef: jasmine.SpyObj<MatSnackBarRef<TextOnlySnackBar>>;
   let mockConfirmationDialog: jasmine.SpyObj<ConfirmationDialogService>;
+  let mockRouter;
 
   beforeEach(() => {
     mockEntityMapper = jasmine.createSpyObj(["remove", "save"]);
@@ -31,37 +32,30 @@ describe("EntityRemoveService", () => {
       providers: [
         { provide: EntityMapperService, useValue: mockEntityMapper },
         { provide: MatSnackBar, useValue: snackBarSpy },
+        Router,
         {
           provide: ConfirmationDialogService,
           useValue: mockConfirmationDialog,
         },
       ],
     });
-    service = TestBed.inject(EntityRemoveService);
-  });
+    mockRouter = TestBed.inject(Router);
+    spyOn(mockRouter, "navigate");
 
-  it("should be created", () => {
-    expect(service).toBeTruthy();
+    service = TestBed.inject(EntityRemoveService);
   });
 
-  it("emits once and closes when the user has cancelled", (done) => {
+  it("should return false when user cancels confirmation", async () => {
     mockConfirmationDialog.getConfirmation.and.resolveTo(false);
-    service
-      .remove(new Entity())
-      .pipe(toArray())
-      .subscribe({
-        next: (next) => {
-          expect(next).toEqual([RemoveResult.CANCELLED]);
-        },
-        complete: () => {
-          expect(snackBarSpy.open).not.toHaveBeenCalled();
-          expect(mockEntityMapper.remove).not.toHaveBeenCalled();
-          done();
-        },
-      });
+
+    const result = await service.remove(new Entity());
+
+    expect(result).toBe(false);
+    expect(snackBarSpy.open).not.toHaveBeenCalled();
+    expect(mockEntityMapper.remove).not.toHaveBeenCalled();
   });
 
-  it("deletes the entity and finishes if the action is never undone", (done) => {
+  it("should delete entity, show snackbar confirmation and navigate back", async () => {
     // onAction is never called
     mockSnackBarRef.onAction.and.returnValues(NEVER);
     // mock that dialog is dismissed immediately
@@ -69,42 +63,35 @@ describe("EntityRemoveService", () => {
       subscriber.next({} as MatSnackBarDismiss),
     );
     mockSnackBarRef.afterDismissed.and.returnValue(afterDismissed);
-    service
-      .remove(new Entity())
-      .pipe(toArray())
-      .subscribe({
-        next: (next) => {
-          expect(next).toEqual([RemoveResult.REMOVED]);
-        },
-        complete: () => {
-          expect(snackBarSpy.open).toHaveBeenCalled();
-          expect(mockEntityMapper.remove).toHaveBeenCalled();
-          done();
-        },
-      });
+
+    const result = await service.remove(new Entity(), true);
+
+    expect(result).toBe(true);
+    expect(snackBarSpy.open).toHaveBeenCalled();
+    expect(mockEntityMapper.remove).toHaveBeenCalled();
+    expect(mockRouter.navigate).toHaveBeenCalled();
   });
 
-  it("emits twice when an entity was deleted and the user pressed undo", (done) => {
+  it("should re-save entity and navigate back to entity on undo", fakeAsync(() => {
+    const entity = new Entity();
+
     // Mock a snackbar where 'undo' is immediately pressed
-    const onSnackbarAction = new Observable<void>((subscriber) =>
-      subscriber.next(),
-    );
-    mockSnackBarRef.onAction.and.returnValue(onSnackbarAction);
+    const onSnackbarAction = new Subject<void>();
+    mockSnackBarRef.onAction.and.returnValue(onSnackbarAction.asObservable());
     mockSnackBarRef.afterDismissed.and.returnValue(NEVER);
+
     mockEntityMapper.save.and.resolveTo();
-    const entity = new Entity();
-    service
-      .remove(entity)
-      .pipe(toArray())
-      .subscribe({
-        next: (next) => {
-          expect(next).toEqual([RemoveResult.REMOVED, RemoveResult.UNDONE]);
-        },
-        complete: () => {
-          expect(mockEntityMapper.remove).toHaveBeenCalled();
-          expect(mockEntityMapper.save).toHaveBeenCalledWith(entity, true);
-          done();
-        },
-      });
-  });
+
+    service.remove(entity, true);
+    tick();
+
+    mockRouter.navigate.calls.reset();
+    onSnackbarAction.next();
+    onSnackbarAction.complete();
+    tick();
+
+    expect(mockEntityMapper.remove).toHaveBeenCalled();
+    expect(mockEntityMapper.save).toHaveBeenCalledWith(entity, true);
+    expect(mockRouter.navigate).toHaveBeenCalled();
+  }));
 });
diff --git a/src/app/core/entity/entity-remove.service.ts b/src/app/core/entity/entity-remove.service.ts
index f416988912..c517dd3b6e 100644
--- a/src/app/core/entity/entity-remove.service.ts
+++ b/src/app/core/entity/entity-remove.service.ts
@@ -3,8 +3,10 @@ import { ConfirmationDialogService } from "../common-components/confirmation-dia
 import { EntityMapperService } from "./entity-mapper/entity-mapper.service";
 import { MatSnackBar } from "@angular/material/snack-bar";
 import { Entity } from "./model/entity";
-import { Observable, race, Subject } from "rxjs";
+import { race } from "rxjs";
 import { map } from "rxjs/operators";
+import { getUrlWithoutParams } from "../../utils/utils";
+import { Router } from "@angular/router";
 
 /**
  * All possible results when removing an entity
@@ -36,14 +38,8 @@ export interface RemoveEntityTextOptions {
 }
 
 /**
- * A service that can be used to safely remove an entity
- * which includes:
- * <ul>
- *  <li> Displaying a confirmation dialog and asking the user whether or not he
- *  wants to delete the entity
- *  <li> Removing the entity in the `EntityMapperService` (if he chose so)
- *  <li> Opening a snack bar to allow the user to undo the action
- * </ul>
+ * A service that can triggers a user flow to safely remove an entity,
+ * including a confirmation dialog.
  */
 @Injectable({
   providedIn: "root",
@@ -53,74 +49,70 @@ export class EntityRemoveService {
     private confirmationDialog: ConfirmationDialogService,
     private entityMapper: EntityMapperService,
     private snackBar: MatSnackBar,
+    private router: Router,
   ) {}
 
   /**
-   * Removes the entity after displaying a confirmation dialog.
-   * The returned observable will emit once or twice, depending on how the
-   * user chose.
-   * <ul>
-   *  <li> When the user chose 'no', the subject will emit once with
-   *  {@link RemoveResult.CANCELLED CANCELLED}.
-   *  <li> When the user chose 'yes', the subject will emit with the result
-   *  {@link RemoveResult.REMOVED REMOVED}. If the user doesn't undo, the subject will complete
-   *  once the snack bar has disappeared. If the user chose undo, the subject will
-   *  emit with the result {@link RemoveResult.UNDONE UNDONE}.
-   * </ul>
-   * <br>
-   * This method takes care of saving the entity as if one were to call the resp. methods
-   * of the `EntityMapperService`. It also restores the entity when the user chose to
-   * undo. All of the aforementioned results will only be called if the actions have already
-   * been taken.
-   * <br>
-   * You do not need to unsubscribe from this method as the observable will be closed on all
-   * possible paths.
+   * Shows a confirmation dialog to the user
+   * and removes the entity if the user confirms.
+   *
+   * This also triggers a toast message, enabling the user to undo the action.
+   *
    * @param entity The entity to remove
    * @param textOptions Options that you can specify to override the default options.
    * You can only specify some of the options, the options that you don't specify will then be
    * the default ones.
+   * @param navigate whether upon delete the app will navigate back
    */
-  remove<E extends Entity>(
+  async remove<E extends Entity>(
     entity: E,
+    navigate: boolean = false,
     textOptions?: RemoveEntityTextOptions,
-  ): Observable<RemoveResult> {
-    const subject = new Subject<RemoveResult>();
+  ): Promise<boolean> {
+    const confirmation = await this.showDeleteConfirmationDialog(
+      textOptions,
+      entity,
+    );
+    if (!confirmation) {
+      return false;
+    }
+
+    await this.entityMapper.remove(entity);
+
+    let currentUrl;
+    if (navigate) {
+      currentUrl = getUrlWithoutParams(this.router);
+      const parentUrl = currentUrl.substring(0, currentUrl.lastIndexOf("/"));
+      await this.router.navigate([parentUrl]);
+    }
+
+    this.showSnackbarConfirmation(textOptions, entity, currentUrl);
+
+    return true;
+  }
+
+  private async showDeleteConfirmationDialog(
+    textOptions: RemoveEntityTextOptions,
+    entity: Entity,
+  ) {
     const dialogTitle =
       textOptions?.dialogTitle || $localize`:Delete confirmation title:Delete?`;
     const dialogText =
       textOptions?.dialogText ||
-      $localize`:Delete confirmation text:Are you sure you want to delete this ${entity.getType()}?`;
-    this.confirmationDialog
-      .getConfirmation(dialogTitle, dialogText)
-      .then((confirmed) => {
-        if (confirmed) {
-          const snackBarTitle =
-            textOptions?.deletedEntityInformation ||
-            $localize`:Deleted Entity information:Deleted Entity ${entity.toString()}`;
-          this.removeEntityAndOpenSnackBar(entity, snackBarTitle, subject);
-        } else {
-          subject.next(RemoveResult.CANCELLED);
-          subject.complete();
-        }
-      });
-    return subject.asObservable();
+      $localize`:Delete confirmation text:Are you sure you want to delete this ${entity.getType()} record?`;
+
+    return this.confirmationDialog.getConfirmation(dialogTitle, dialogText);
   }
 
-  /**
-   * Decoupled from the main method for readability
-   * @param entity The entity to remove
-   * @param snackBarTitle The title of the snack-bar
-   * @param resultSender The sender that informs when the user
-   * has clicked 'undo' and that completes once no undo is possible
-   * @private
-   */
-  private async removeEntityAndOpenSnackBar(
+  private showSnackbarConfirmation(
+    textOptions: RemoveEntityTextOptions,
     entity: Entity,
-    snackBarTitle: string,
-    resultSender: Subject<RemoveResult>,
+    currentUrl?: string,
   ) {
-    await this.entityMapper.remove(entity);
-    resultSender.next(RemoveResult.REMOVED);
+    const snackBarTitle =
+      textOptions?.deletedEntityInformation ||
+      $localize`:Deleted Entity information:Deleted Entity ${entity.toString()}`;
+
     const snackBarRef = this.snackBar.open(
       snackBarTitle,
       $localize`:Undo deleting an entity:Undo`,
@@ -134,9 +126,10 @@ export class EntityRemoveService {
     ).subscribe(async (next) => {
       if (next) {
         await this.entityMapper.save(entity, true);
-        resultSender.next(RemoveResult.UNDONE);
+        if (currentUrl) {
+          await this.router.navigate([currentUrl]);
+        }
       }
-      resultSender.complete();
     });
   }
 }
diff --git a/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.spec.ts b/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.spec.ts
index 3a0243edab..b25d9903a8 100644
--- a/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.spec.ts
+++ b/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.spec.ts
@@ -15,11 +15,8 @@ import { Child } from "../../../child-dev-project/children/model/child";
 import { Router } from "@angular/router";
 import { MockedTestingModule } from "../../../utils/mocked-testing.module";
 import { FormGroup } from "@angular/forms";
-import {
-  EntityRemoveService,
-  RemoveResult,
-} from "../../entity/entity-remove.service";
-import { firstValueFrom, of, Subject } from "rxjs";
+import { EntityRemoveService } from "../../entity/entity-remove.service";
+import { firstValueFrom, Subject } from "rxjs";
 import { UnsavedChangesService } from "../../entity-details/form/unsaved-changes.service";
 
 describe("DialogButtonsComponent", () => {
@@ -97,13 +94,17 @@ describe("DialogButtonsComponent", () => {
     expect(component.detailsRoute).toBe(`${Child.route}/${child.getId()}`);
   });
 
-  it("should close the dialog if a entity is deleted", () => {
+  it("should close the dialog if a entity is deleted", async () => {
     const removeSpy = spyOn(TestBed.inject(EntityRemoveService), "remove");
-    removeSpy.and.returnValue(of(RemoveResult.REMOVED));
-
-    component.delete();
 
+    removeSpy.and.resolveTo(true);
+    await component.delete();
     expect(dialogRef.close).toHaveBeenCalled();
+
+    dialogRef.close.calls.reset();
+    removeSpy.and.resolveTo(false);
+    await component.delete();
+    expect(dialogRef.close).not.toHaveBeenCalled();
   });
 
   it("should only close the dialog if user confirms to discard changes", fakeAsync(() => {
diff --git a/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.ts b/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.ts
index a90089b69f..8006508e4e 100644
--- a/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.ts
+++ b/src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.ts
@@ -7,10 +7,7 @@ import { DisableEntityOperationDirective } from "../../permissions/permission-di
 import { Entity } from "../../entity/model/entity";
 import { FormGroup } from "@angular/forms";
 import { InvalidFormFieldError } from "../../common-components/entity-form/invalid-form-field.error";
-import {
-  EntityRemoveService,
-  RemoveResult,
-} from "../../entity/entity-remove.service";
+import { EntityRemoveService } from "../../entity/entity-remove.service";
 import { EntityFormService } from "../../common-components/entity-form/entity-form.service";
 import { AlertService } from "../../alerts/alert.service";
 import { MatMenuModule } from "@angular/material/menu";
@@ -100,11 +97,10 @@ export class DialogButtonsComponent implements OnInit {
       });
   }
 
-  delete() {
-    this.entityRemoveService.remove(this.entity).subscribe((result) => {
-      if (result === RemoveResult.REMOVED) {
-        this.dialog.close();
-      }
-    });
+  async delete() {
+    const result = await this.entityRemoveService.remove(this.entity);
+    if (result) {
+      this.dialog.close();
+    }
   }
 }