diff --git a/contracts/utils/cryptography/signers/SignerWebAuthn.sol b/contracts/utils/cryptography/signers/SignerWebAuthn.sol
index 7352950bd46..1c1b95d8f41 100644
--- a/contracts/utils/cryptography/signers/SignerWebAuthn.sol
+++ b/contracts/utils/cryptography/signers/SignerWebAuthn.sol
@@ -40,12 +40,12 @@ abstract contract SignerWebAuthn is SignerP256 {
         bytes32 hash,
         bytes calldata signature
     ) internal view virtual override returns (bool) {
-        (bytes32 qx, bytes32 qy) = signer();
         (bool decodeSuccess, WebAuthn.WebAuthnAuth calldata auth) = WebAuthn.tryDecodeAuth(signature);
-
-        return
-            decodeSuccess
-                ? WebAuthn.verify(abi.encodePacked(hash), auth, qx, qy)
-                : super._rawSignatureValidation(hash, signature);
+        if (decodeSuccess) {
+            (bytes32 qx, bytes32 qy) = signer();
+            return WebAuthn.verify(abi.encodePacked(hash), auth, qx, qy);
+        } else {
+            return super._rawSignatureValidation(hash, signature);
+        }
     }
 }