diff --git a/packages/appview/src/index.ts b/packages/appview/src/index.ts
index ae2d877..637c7e6 100644
--- a/packages/appview/src/index.ts
+++ b/packages/appview/src/index.ts
@@ -120,7 +120,7 @@ export class Server {
   async close() {
     this.ctx.logger.info('sigint received, shutting down')
     await this.ctx.ingester.destroy()
-    return new Promise<void>((resolve) => {
+    await new Promise<void>((resolve) => {
       this.server.close(() => {
         this.ctx.logger.info('server closed')
         resolve()
@@ -135,6 +135,7 @@ const run = async () => {
   const onCloseSignal = async () => {
     setTimeout(() => process.exit(1), 10000).unref() // Force shutdown after 10s
     await server.close()
+    process.exit(0)
   }
 
   process.on('SIGINT', onCloseSignal)
diff --git a/packages/appview/src/ingestors/jetstream.ts b/packages/appview/src/ingestors/jetstream.ts
index d9ac499..5dcae9c 100644
--- a/packages/appview/src/ingestors/jetstream.ts
+++ b/packages/appview/src/ingestors/jetstream.ts
@@ -93,6 +93,7 @@ export class Jetstream<T> {
   private cursor?: number
   private ws?: WebSocket
   private isStarted = false
+  private isDestroyed = false
   private wantedCollections: string[]
 
   constructor({
@@ -133,6 +134,7 @@ export class Jetstream<T> {
   start() {
     if (this.isStarted) return
     this.isStarted = true
+    this.isDestroyed = false
     this.ws = new WebSocket(this.constructUrlWithQuery())
 
     this.ws.on('open', () => {
@@ -159,13 +161,16 @@ export class Jetstream<T> {
     })
 
     this.ws.on('close', (code, reason) => {
-      this.logger.error(`Jetstream closed. Code: ${code}, Reason: ${reason}`)
+      if (!this.isDestroyed) {
+        this.logger.error(`Jetstream closed. Code: ${code}, Reason: ${reason}`)
+      }
       this.isStarted = false
     })
   }
 
   destroy() {
     if (this.ws) {
+      this.isDestroyed = true
       this.ws.close()
       this.isStarted = false
     }