diff --git a/libs/common/src/webauthn/services/fido2-authenticator.service.ts b/libs/common/src/webauthn/services/fido2-authenticator.service.ts
index 166bede78ce..e61fcd9cb5c 100644
--- a/libs/common/src/webauthn/services/fido2-authenticator.service.ts
+++ b/libs/common/src/webauthn/services/fido2-authenticator.service.ts
@@ -351,7 +351,7 @@ async function generateAuthData(params: AuthDataParams) {
 
   const flags = authDataFlags({
     extensionData: false,
-    attestationData: false,
+    attestationData: params.keyPair != undefined,
     userVerification: params.userVerification,
     userPresence: params.userPresence,
   });