diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index caa1116f9a..c3b151afc3 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -9,7 +9,7 @@ import { select, Store } from '@ngrx/store';
 import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
 import { CorrelationIdService } from './correlation-id/correlation-id.service';
 import { APP_INITIALIZER, Inject, Provider, Type } from '@angular/core';
-import { makeStateKey, TransferState } from '@angular/platform-browser';
+import { makeStateKey, TransferState } from '@angular/core';
 import {
   APP_CONFIG,
   APP_DATA_SERVICES_MAP,
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 6f9e27616f..c9ca877b8f 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -1,5 +1,5 @@
 import { InjectionToken, Type } from '@angular/core';
-import { makeStateKey } from '@angular/platform-browser';
+import { makeStateKey } from '@angular/core';
 import { Config } from './config.interface';
 import { ServerConfig } from './server-config.interface';
 import { CacheConfig } from './cache-config.interface';
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index fa6e3b5362..fff06e9ebe 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { APP_ID, NgModule } from '@angular/core';
-import { makeStateKey, TransferState } from '@angular/platform-browser';
+import { makeStateKey, TransferState } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index bf40f0c68b..3f646b1722 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -8,7 +8,7 @@
 import { InitService } from '../../app/init.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../app/app.reducer';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
 import { DefaultAppConfig } from '../../config/default-app-config';
 import { extendEnvironmentWithAppConfig } from '../../config/config.util';
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 2ced9328c6..5ff4294f42 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -1,6 +1,6 @@
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { APP_ID, NgModule } from '@angular/core';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
 
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 715f872cd9..c96af3fc17 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -8,7 +8,7 @@
 import { InitService } from '../../app/init.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../app/app.reducer';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
 import { environment } from '../../environments/environment';
diff --git a/src/ngx-translate-loaders/ngx-translate-state.ts b/src/ngx-translate-loaders/ngx-translate-state.ts
index 4e6c2f496b..3646053fad 100644
--- a/src/ngx-translate-loaders/ngx-translate-state.ts
+++ b/src/ngx-translate-loaders/ngx-translate-state.ts
@@ -1,4 +1,4 @@
-import { makeStateKey } from '@angular/platform-browser';
+import { makeStateKey } from '@angular/core';
 
 /**
  * Represents ngx-translate messages in different languages in the TransferState
diff --git a/src/ngx-translate-loaders/translate-browser.loader.ts b/src/ngx-translate-loaders/translate-browser.loader.ts
index 85d59c96f0..3f5c65d898 100644
--- a/src/ngx-translate-loaders/translate-browser.loader.ts
+++ b/src/ngx-translate-loaders/translate-browser.loader.ts
@@ -1,6 +1,6 @@
 import { TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
 import { hasValue } from '../app/shared/empty.util';
 import { map } from 'rxjs/operators';
diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts
index 1f47dfe95b..1879d79649 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -1,7 +1,7 @@
 import { TranslateLoader } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { readFileSync } from 'fs';
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
 
 /**