diff --git a/contributors.yml b/contributors.yml
index 12d552458c3..f3fe859d7e4 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -12,6 +12,7 @@
 - alex-ketch
 - alexuxui
 - andrelandgraf
+- andrewbrey
 - AndrewIngram
 - anishpras
 - anmolm96
@@ -254,10 +255,10 @@
 - robindrost
 - roddds
 - RomanSavarin
+- rossipedia
 - RossJHagan
 - RossMcMillan92
 - rowinbot
-- rossipedia
 - rphlmr
 - rtabulov
 - ruisaraiva19
diff --git a/packages/remix-serve/cli.ts b/packages/remix-serve/cli.ts
index 13310b1db1a..3e696afe51f 100644
--- a/packages/remix-serve/cli.ts
+++ b/packages/remix-serve/cli.ts
@@ -36,9 +36,10 @@ let onListen = () => {
 };
 
 let app = createApp(buildPath);
+let server = process.env.HOST
+  ? app.listen(port, process.env.HOST, onListen)
+  : app.listen(port, onListen);
 
-if (process.env.HOST) {
-  app.listen(port, process.env.HOST, onListen);
-} else {
-  app.listen(port, onListen);
-}
+["SIGTERM", "SIGINT"].forEach((signal) => {
+  process.once(signal, () => server?.close(console.error));
+});