diff --git a/common/src/models/response/profileResponse.ts b/common/src/models/response/profileResponse.ts
index 3185cffbef..1c6e64faee 100644
--- a/common/src/models/response/profileResponse.ts
+++ b/common/src/models/response/profileResponse.ts
@@ -33,7 +33,7 @@ export class ProfileResponse extends BaseResponse {
         this.key = this.getResponseProperty('Key');
         this.privateKey = this.getResponseProperty('PrivateKey');
         this.securityStamp = this.getResponseProperty('SecurityStamp');
-        this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset');
+        this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset') ?? false;
 
         const organizations = this.getResponseProperty('Organizations');
         if (organizations != null) {
diff --git a/electron/src/services/electronStorage.service.ts b/electron/src/services/electronStorage.service.ts
index 5bf8d26cbb..529067dc7b 100644
--- a/electron/src/services/electronStorage.service.ts
+++ b/electron/src/services/electronStorage.service.ts
@@ -46,6 +46,9 @@ export class ElectronStorageService implements StorageService {
     }
 
     save(key: string, obj: any): Promise<any> {
+        if (obj == null) {
+            return Promise.resolve();
+        }
         if (obj instanceof Set) {
             obj = Array.from(obj);
         }