diff --git a/common/src/models/domain/account.ts b/common/src/models/domain/account.ts
index e2fb8766..092684fa 100644
--- a/common/src/models/domain/account.ts
+++ b/common/src/models/domain/account.ts
@@ -126,6 +126,7 @@ export class Account {
     convertAccountToKeyConnector: boolean;
     usesKeyConnector: boolean;
     enableFullWidth: boolean;
+    organizationInvitation: any;
 
     private hasPremiumPersonally: boolean;
 
diff --git a/common/src/models/domain/globalState.ts b/common/src/models/domain/globalState.ts
index c6d74849..3f739c6a 100644
--- a/common/src/models/domain/globalState.ts
+++ b/common/src/models/domain/globalState.ts
@@ -4,7 +4,6 @@ export class GlobalState {
     lastActive: number;
     locale: string;
     openAtLogin: boolean;
-    organizationInvitation: any;
     rememberEmail: boolean;
     rememberedEmail: string;
     theme: string;
diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 5d3a804d..111c2803 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -946,12 +946,12 @@ export class StateService implements StateServiceAbstraction {
     }
 
     async getOrganizationInvitation(options?: StorageOptions): Promise<any> {
-        return (await this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions))).organizationInvitation;
+        return (await this.getAccount(this.reconcileOptions(options, this.defaultOnDiskOptions))).organizationInvitation;
     }
     async setOrganizationInvitation(value: any, options?: StorageOptions): Promise<void> {
-        const globals = await this.getGlobals(this.reconcileOptions(options, this.defaultInMemoryOptions));
-        globals.organizationInvitation = value;
-        await this.saveGlobals(globals, this.reconcileOptions(options, this.defaultInMemoryOptions));
+        const account = await this.getAccount(this.reconcileOptions(options, this.defaultOnDiskOptions));
+        account.organizationInvitation = value;
+        await this.saveAccount(account, this.reconcileOptions(options, this.defaultOnDiskOptions));
     }
 
     async getOrganizations(options?: StorageOptions): Promise<{ [id: string]: OrganizationData; }> {