diff --git a/src/models/response/twoFactorU2fResponse.ts b/src/models/response/twoFactorU2fResponse.ts
index 334b7994e8..7ab62cc627 100644
--- a/src/models/response/twoFactorU2fResponse.ts
+++ b/src/models/response/twoFactorU2fResponse.ts
@@ -4,7 +4,7 @@ export class TwoFactorU2fResponse {
 
     constructor(response: any) {
         this.enabled = response.Enabled;
-        this.challenge = new ChallengeResponse(response.Challenge);
+        this.challenge = response.Challenge == null ? null : new ChallengeResponse(response.Challenge);
     }
 }