diff --git a/keepassxc-browser/content/passkeys-utils.js b/keepassxc-browser/content/passkeys-utils.js
index 5440c7a..24f0e0d 100644
--- a/keepassxc-browser/content/passkeys-utils.js
+++ b/keepassxc-browser/content/passkeys-utils.js
@@ -94,11 +94,6 @@ kpxcPasskeysUtils.buildCredentialCreationOptions = function(pkOptions, sameOrigi
         publicKey.user.id = arrayBufferToBase64(pkOptions.user.id);
         publicKey.user.name = pkOptions.user.name;
 
-        // TODO: Disable after fixed in KeePassXC side
-        if (!publicKey.rp.id) {
-            publicKey.rp.id = window.location.hostname;
-        }
-
         return publicKey;
     } catch (e) {
         console.log(e);
@@ -138,11 +133,6 @@ kpxcPasskeysUtils.buildCredentialRequestOptions = function(pkOptions, sameOrigin
             }
         }
 
-        // TODO: Disable after fixed in KeePassXC side
-        if (!publicKey.rpId) {
-            publicKey.rpId = window.location.hostname;
-        }
-
         return publicKey;
     } catch (e) {
         console.log(e);