diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx
index 36b911a14..47664a2c4 100644
--- a/desktop/flipper-server/src/index.tsx
+++ b/desktop/flipper-server/src/index.tsx
@@ -18,6 +18,7 @@ import open from 'open';
 import {initCompanionEnv} from 'flipper-server-companion';
 import {startFlipperServer, startServer} from 'flipper-server-core';
 import {isTest} from 'flipper-common';
+import exitHook from 'exit-hook';
 
 const argv = yargs
   .usage('yarn flipper-server [args]')
@@ -115,6 +116,10 @@ async function start() {
     'external',
   );
 
+  exitHook(async () => {
+    await flipperServer.close();
+  });
+
   enhanceLogger((logEntry) => {
     flipperServer.emit('server-log', logEntry);
   });