diff --git a/.changeset/tame-masks-juggle.md b/.changeset/tame-masks-juggle.md
new file mode 100644
index 0000000000..91ee43945a
--- /dev/null
+++ b/.changeset/tame-masks-juggle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Close eventSource upon completion of a scaffolder task
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 6caa2a4446..0c5eb2b268 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -214,6 +214,7 @@ export class ScaffolderClient implements ScaffolderApi {
                 subscriber.error(ex);
               }
             }
+            eventSource.close();
             subscriber.complete();
           });
           eventSource.addEventListener('error', event => {