diff --git a/.changeset/soft-dolphins-join.md b/.changeset/soft-dolphins-join.md
new file mode 100644
index 000000000..e03f6b388
--- /dev/null
+++ b/.changeset/soft-dolphins-join.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Prevent CLI from hanging
diff --git a/packages/astro/astro.js b/packages/astro/astro.js
index 69ea565f7..d763b0302 100755
--- a/packages/astro/astro.js
+++ b/packages/astro/astro.js
@@ -96,4 +96,6 @@ Please upgrade Node.js to a supported version: "${engines}"\n`);
 	process.exit(1);
 }
 
-main();
+main()
+	.then(() => process.exit(0))
+	.catch(() => process.exit(1));