diff --git a/lib/cli.js b/lib/cli.js
index cc00b45a3..e517acc6e 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -522,7 +522,7 @@ export default async function loadCli() { // eslint-disable-line complexity
 			providers,
 			reporter,
 			stdin: process.stdin,
-			signal: abortController.signal,
+			signal: abortController?.signal,
 		});
 	} else {
 		let debugWithoutSpecificFile = false;
diff --git a/lib/watcher.js b/lib/watcher.js
index 470a32229..cf29c5518 100644
--- a/lib/watcher.js
+++ b/lib/watcher.js
@@ -370,15 +370,15 @@ async function * plan({api, filter, globs, projectDir, providers, stdin, abortSi
 		}
 	});
 
-	abortSignal.addEventListener('abort', () => {
+	abortSignal?.addEventListener('abort', () => {
 		signalChanged?.({});
 	});
 
 	// And finally, the watch loop.
-	while (!abortSignal.aborted) {
+	while (abortSignal?.aborted !== true) {
 		const {testFiles: files = [], runOnlyExclusive = false} = await changed; // eslint-disable-line no-await-in-loop
 
-		if (abortSignal.aborted) {
+		if (abortSignal?.aborted) {
 			break;
 		}
 
diff --git a/package-lock.json b/package-lock.json
index 6e43e8014..aee814ebf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "ava",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ava",
-			"version": "6.0.0",
+			"version": "6.0.1",
 			"license": "MIT",
 			"dependencies": {
 				"@vercel/nft": "^0.24.4",
diff --git a/package.json b/package.json
index 5d22b225f..984c501e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": "avajs/ava",