diff --git a/libs/common/src/platform/services/fido2/domain-utils.ts b/libs/common/src/platform/services/fido2/domain-utils.ts
index 16b495f47e9..542beae3435 100644
--- a/libs/common/src/platform/services/fido2/domain-utils.ts
+++ b/libs/common/src/platform/services/fido2/domain-utils.ts
@@ -48,7 +48,12 @@ export function isValidRpId(rpId: string, origin: string) {
   if (rpId !== "localhost" && !rpId.includes(".")) {
     return false;
   }
-  if (parsedOrigin.hostname !== "localhost" && !parsedOrigin.hostname.includes(".")) {
+
+  if (
+    parsedOrigin.hostname != null &&
+    parsedOrigin.hostname !== "localhost" &&
+    !parsedOrigin.hostname.includes(".")
+  ) {
     return false;
   }
 
@@ -65,7 +70,7 @@ export function isValidRpId(rpId: string, origin: string) {
 
   // Check if origin is a subdomain of rpId
   // This prevents "evilaccounts.example.com" from matching "accounts.example.com"
-  if (parsedOrigin.hostname.endsWith("." + rpId)) {
+  if (parsedOrigin.hostname != null && parsedOrigin.hostname.endsWith("." + rpId)) {
     return true;
   }