diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 05e02b8a..c663f12d 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -1274,7 +1274,7 @@ export class StateService implements StateServiceAbstraction {
             this.secureStorageService :
             this.storageService;
 
-        const state = await storageLocation.get<State>('state', options);
+        const state = await storageLocation.get<State>('state', options) ?? new State();
         state.accounts[account.userId] = account;
 
         await storageLocation.save('state', state, options);