diff --git a/libs/common/src/models/export/login.export.ts b/libs/common/src/models/export/login.export.ts
index 366a1761fd2..37e9ab34ec3 100644
--- a/libs/common/src/models/export/login.export.ts
+++ b/libs/common/src/models/export/login.export.ts
@@ -38,7 +38,11 @@ export class LoginExport {
     domain.username = conditionalEncString(req.username);
     domain.password = conditionalEncString(req.password);
     domain.totp = conditionalEncString(req.totp);
-    // Fido2credentials are currently not supported for exports.
+    if (req.fido2Credentials != null) {
+      domain.fido2Credentials = req.fido2Credentials.map((f2) =>
+        Fido2CredentialExport.toDomain(f2),
+      );
+    }
 
     return domain;
   }