diff --git a/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts b/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts
index df0f9231e9..e929d489f7 100644
--- a/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts
@@ -39,7 +39,7 @@ export class ReplaceableComponentsService {
       replaceableComponents.push(replaceableComponent);
     }
 
-    this.store.patch(replaceableComponents);
+    this.store.set(replaceableComponents);
 
     if (reload) reloadRoute(this.router, this.ngZone);
   }
diff --git a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts
index bdc53fa26c..1d1c1e394d 100644
--- a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts
@@ -30,7 +30,7 @@ export class SessionStateService {
   private init() {
     const session = localStorage.getItem('abpSession');
     if (session) {
-      this.store.patch(JSON.parse(session));
+      this.store.set(JSON.parse(session));
     }
 
     this.store.sliceUpdate(state => state).subscribe(this.updateLocalStorage);
@@ -81,7 +81,7 @@ export class SessionStateService {
   setTenant(tenant: CurrentTenantDto) {
     if (compare(tenant, this.store.state.tenant)) return;
 
-    this.store.patch({ tenant });
+    this.store.set({ ...this.store.state, tenant });
   }
 
   setLanguage(language: string) {
diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
index 4291219db8..d37200c9c8 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
@@ -38,8 +38,6 @@ export function getInitialData(injector: Injector) {
         tap(() => checkAccessToken(injector)),
         tap(() => {
           const currentTenant = configState.getOne('currentTenant') as CurrentTenantDto;
-          if (!currentTenant?.id) return;
-
           injector.get(SessionStateService).setTenant(currentTenant);
         }),
       )
diff --git a/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts
index fbf707c284..87bc3f81fd 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts
@@ -36,6 +36,6 @@ export class InternalStore<State> {
   }
 
   reset() {
-    this.patch(this.initialState);
+    this.set(this.initialState);
   }
 }