diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 6f9822cd09..3f9b77a3a3 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -369,7 +369,9 @@ export interface TaskBroker {
         events: SerializedTaskEvent[];
       },
     ) => void,
-  ): () => void;
+  ): {
+    unsubscribe: () => void;
+  };
   // (undocumented)
   vacuumTasks(timeoutS: { timeoutS: number }): Promise<void>;
 }
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 7845ca994a..7e7ebe5436 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -178,7 +178,7 @@ export class StorageTaskBroker implements TaskBroker {
       error: Error | undefined,
       result: { events: SerializedTaskEvent[] },
     ) => void,
-  ): () => void {
+  ): { unsubscribe: () => void } {
     const { taskId } = options;
 
     let cancelled = false;
@@ -205,7 +205,7 @@ export class StorageTaskBroker implements TaskBroker {
       }
     })();
 
-    return unsubscribe;
+    return { unsubscribe };
   }
 
   async vacuumTasks(timeoutS: { timeoutS: number }): Promise<void> {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 6b3075844d..6cfd914bd2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -166,7 +166,7 @@ export interface TaskBroker {
       error: Error | undefined,
       result: { events: SerializedTaskEvent[] },
     ) => void,
-  ): () => void;
+  ): { unsubscribe: () => void };
   get(taskId: string): Promise<SerializedTask>;
 }
 
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 814b235bf2..a78b04da78 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -258,7 +258,7 @@ export async function createRouter(
       });
 
       // After client opens connection send all events as string
-      const unsubscribe = taskBroker.observe(
+      const { unsubscribe } = taskBroker.observe(
         { taskId, after },
         (error, { events }) => {
           if (error) {