diff --git a/packages/opencode/src/app/app.ts b/packages/opencode/src/app/app.ts
index de7aff896..0c88be273 100644
--- a/packages/opencode/src/app/app.ts
+++ b/packages/opencode/src/app/app.ts
@@ -115,10 +115,10 @@ export namespace App {
                 log.info("shutdown", { name: key })
                 await entry.shutdown?.(await entry.state)
               }
+              await Instance.dispose()
             }
           },
         )
-        await Instance.dispose()
         return result
       })
     })