diff --git a/packages/core/server/src/app-supervisor.ts b/packages/core/server/src/app-supervisor.ts
index 3006bba000..7698ddfcf3 100644
--- a/packages/core/server/src/app-supervisor.ts
+++ b/packages/core/server/src/app-supervisor.ts
@@ -305,7 +305,7 @@ export class AppSupervisor extends EventEmitter implements AsyncEmitter {
       }
     });
 
-    app.on('afterStop', async () => {
+    app.on('__stopped', async () => {
       this.setAppStatus(app.name, 'stopped');
     });
 
diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts
index 835997a529..574dd5f4af 100644
--- a/packages/core/server/src/application.ts
+++ b/packages/core/server/src/application.ts
@@ -955,6 +955,7 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
     }
 
     await this.emitAsync('afterStop', this, options);
+    this.emit('__stopped', this, options);
 
     this.stopped = true;
     log.info(`app has stopped`, { method: 'stop' });