diff --git a/keepassxc-browser/content/passkeys.js b/keepassxc-browser/content/passkeys.js
index e2e6217..c596eb9 100644
--- a/keepassxc-browser/content/passkeys.js
+++ b/keepassxc-browser/content/passkeys.js
@@ -203,8 +203,9 @@
             if (!response.publicKey) {
                 if (!response.fallback) {
                     throwError(response?.errorCode, response?.errorMessage);
+                    return null;
                 }
-                return response.fallback ? originalCredentials.create(options) : null;
+                return originalCredentials.create(options);
             }
 
             return createPublicKeyCredential(response.publicKey);
@@ -228,8 +229,9 @@
             if (!response.publicKey) {
                 if (!response.fallback) {
                     throwError(response?.errorCode, response?.errorMessage);
+                    return null;
                 }
-                return response.fallback ? originalCredentials.get(options) : null;
+                return originalCredentials.get(options);
             }
 
             return createPublicKeyCredential(response.publicKey);