1 files changed, 6 insertions, 4 deletions
diff --git a/packages/taler-util/src/observability.ts b/packages/taler-util/src/observability.ts
index f40967c52..70391cbcd 100644
--- a/packages/taler-util/src/observability.ts
+++ b/packages/taler-util/src/observability.ts
@@ -38,14 +38,14 @@ export interface ObservabilityContext {
 let seqId = 1000;
 
 export class ObservableHttpClientLibrary implements HttpRequestLibrary {
-  private readonly currentRequest = new Map<string, CancellationToken.Source>();
+  private readonly cancelatorById = new Map<string, CancellationToken.Source>();
   constructor(
     private impl: HttpRequestLibrary,
     private oc: ObservabilityContext,
   ) {}
 
-  public cancelRequest(id: string) {
-    const cancelator = this.currentRequest.get(id);
+  public cancelRequest(id: string): void {
+    const cancelator = this.cancelatorById.get(id);
     if (!cancelator) return;
     cancelator.cancel();
   }
@@ -61,7 +61,7 @@ export class ObservableHttpClientLibrary implements HttpRequestLibrary {
     if (opt?.cancellationToken) {
       opt.cancellationToken.onCancelled(cancelator.cancel);
     }
-    this.currentRequest.set(id, cancelator);
+    this.cancelatorById.set(id, cancelator);
 
     this.oc.observe({
       id,
@@ -91,6 +91,8 @@ export class ObservableHttpClientLibrary implements HttpRequestLibrary {
         error: getErrorDetailFromException(e),
       });
       throw e;
+    } finally {
+      this.cancelatorById.delete(id)
     }
   }
 }