cpp233
diff --git a/‎.changeset/odd-rats-smash.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/odd-rats-smash.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎packages/clerk-js/src/ui/components/SignIn/utils.ts‎
Lines changed: 18 additions & 3 deletions b/‎packages/clerk-js/src/ui/components/SignIn/utils.ts‎
Lines changed: 18 additions & 3 deletions
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Fix: fallback to other first factors when preferred strategy is passkey but the user has not registered a passkey yet.
@@ -1,6 +1,7 @@
 import { titleize } from '@clerk/shared';
 import type { PreferredSignInStrategy, SignInFactor, SignInResource, SignInStrategy } from '@clerk/types';
 
+import { isWebAuthnSupported } from '../../../utils/passkeys';
 import { PREFERRED_SIGN_IN_STRATEGIES } from '../../common/constants';
 import { otpPrefFactorComparator, passwordPrefFactorComparator } from '../../utils/factorSorting';
 
@@ -55,6 +56,22 @@ const factorForIdentifier = (i: string | null) => (f: SignInFactor) => {
   return 'safeIdentifier' in f && f.safeIdentifier === i;
 };
 
+function determineStrategyWhenPasskeyIsPreferred(
+  factors: SignInFactor[],
+  identifier: string | null,
+): SignInFactor | null {
+  if (isWebAuthnSupported()) {
+    // @ts-ignore
+    const passkeyFactor = factors.find(({ strategy }) => strategy === 'passkey');
+
+    if (passkeyFactor) {
+      return passkeyFactor;
+    }
+  }
+
+  return determineStrategyWhenOTPIsPreferred(factors, identifier);
+}
+
 function determineStrategyWhenPasswordIsPreferred(
   factors: SignInFactor[],
   identifier: string | null,
@@ -90,10 +107,8 @@ export function determineStartingSignInFactor(
     return null;
   }
 
-  //TODO: Create proper function like `determineStrategyWhenOTPIsPreferred`
   if (preferredSignInStrategy === PREFERRED_SIGN_IN_STRATEGIES.Passkey) {
-    // @ts-ignore
-    return firstFactors.find(f => f.strategy === PREFERRED_SIGN_IN_STRATEGIES.Passkey);
+    return determineStrategyWhenPasskeyIsPreferred(firstFactors, identifier);
   }
   return preferredSignInStrategy === PREFERRED_SIGN_IN_STRATEGIES.Password
     ? determineStrategyWhenPasswordIsPreferred(firstFactors, identifier)
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@clerk/clerk-js': patch
 +---
++
 +Fix: fallback to other first factors when preferred strategy is passkey but the user has not registered a passkey yet.