diff --git a/app/client/hooks/use-server-events.ts b/app/client/hooks/use-server-events.ts
index dd041398..d847dd7e 100644
--- a/app/client/hooks/use-server-events.ts
+++ b/app/client/hooks/use-server-events.ts
@@ -51,10 +51,12 @@ export interface MirrorEvent {
 export interface DoctorEvent {
 	repositoryId: string;
 	repositoryName: string;
+	error?: string;
 }
 
 export interface DoctorCompletedEvent extends DoctorEvent {
 	success: boolean;
+	completedAt: number;
 	steps: Array<{
 		step: string;
 		success: boolean;
diff --git a/app/server/core/repository-mutex.ts b/app/server/core/repository-mutex.ts
index 959c8778..663bd1d3 100644
--- a/app/server/core/repository-mutex.ts
+++ b/app/server/core/repository-mutex.ts
@@ -87,9 +87,7 @@ class RepositoryMutex {
 			}
 		});
 
-		if (onAbort) {
-			signal?.removeEventListener("abort", onAbort);
-		}
+		signal?.removeEventListener("abort", onAbort);
 
 		if (signal?.aborted) {
 			this.releaseShared(repositoryId, lockId);
@@ -138,9 +136,7 @@ class RepositoryMutex {
 			}
 		});
 
-		if (onAbort) {
-			signal?.removeEventListener("abort", onAbort);
-		}
+		signal?.removeEventListener("abort", onAbort);
 
 		if (signal?.aborted) {
 			this.releaseExclusive(repositoryId, lockId);