diff --git a/.changeset/serious-carrots-obey.md b/.changeset/serious-carrots-obey.md
new file mode 100644
index 0000000..d33719f
--- /dev/null
+++ b/.changeset/serious-carrots-obey.md
@@ -0,0 +1,5 @@
+---
+"@emdash-cms/admin": patch
+---
+
+Fixes passkey login error handling when no credential is returned from the authenticator
diff --git a/packages/admin/src/components/auth/PasskeyLogin.tsx b/packages/admin/src/components/auth/PasskeyLogin.tsx
index a5a5937..424e484 100644
--- a/packages/admin/src/components/auth/PasskeyLogin.tsx
+++ b/packages/admin/src/components/auth/PasskeyLogin.tsx
@@ -200,7 +200,10 @@ export function PasskeyLogin({
 				const rawCredential = await navigator.credentials.get(credentialOptions);
 
 				if (!rawCredential) {
-					throw new Error("No credential returned from authenticator");
+					const message = "No credential returned from authenticator";
+					setState({ status: "error", message });
+					onError?.(new Error(message));
+					return;
 				}
 
 				// Step 3: Send credential to server for verification