diff --git a/src/cli/mothership.ts b/src/cli/mothership.ts
index e1d1d48e..b6043cc0 100644
--- a/src/cli/mothership.ts
+++ b/src/cli/mothership.ts
@@ -20,6 +20,7 @@ import {
   PortService,
 } from '$services'
 import { LoggerService, LogLevelName } from '$shared'
+import { gracefulExit } from '$util'
 import EventSource from 'eventsource'
 // gen:import
 
@@ -73,4 +74,7 @@ global.EventSource = EventSource
     ],
   })
   info(`Mothership URL for this session is ${url}`)
+  exitCode.then((c) => {
+    gracefulExit(c)
+  })
 })()