diff --git a/jslib b/jslib
index 92a65b7b36..448856cc22 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 92a65b7b368a8dbf55350657674c90169b04c30b
+Subproject commit 448856cc22510086bfddc99e3f1022ee28727694
diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index be5988b0fb..9647f5950c 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -171,7 +171,7 @@ export default class MainBackground {
     this.stateMigrationService = new StateMigrationService(
       this.storageService,
       this.secureStorageService,
-      new GlobalStateFactory(GlobalState)
+      new StateFactory(GlobalState, Account)
     );
     this.stateService = new StateService(
       this.storageService,
diff --git a/src/services/state.service.ts b/src/services/state.service.ts
index bb7556a796..ec6e9f1959 100644
--- a/src/services/state.service.ts
+++ b/src/services/state.service.ts
@@ -1,3 +1,4 @@
+import { GlobalState } from "jslib-common/models/domain/globalState";
 import { StorageOptions } from "jslib-common/models/domain/storageOptions";
 import { StateService as BaseStateService } from "jslib-common/services/state.service";
 
@@ -7,7 +8,10 @@ import { BrowserGroupingsComponentState } from "../models/browserGroupingsCompon
 import { BrowserSendComponentState } from "../models/browserSendComponentState";
 import { StateService as StateServiceAbstraction } from "./abstractions/state.service";
 
-export class StateService extends BaseStateService<Account> implements StateServiceAbstraction {
+export class StateService
+  extends BaseStateService<GlobalState, Account>
+  implements StateServiceAbstraction
+{
   async addAccount(account: Account) {
     // Apply browser overrides to default account values
     account = new Account(account);