diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts
index 0aaf91026f..e50efe2f6d 100644
--- a/src/app/core/provide-core.ts
+++ b/src/app/core/provide-core.ts
@@ -82,11 +82,6 @@ export const provideCore = () => {
   console.log('provideCore');
   return makeEnvironmentProviders([
     { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
-
-    importProvidersFrom(
-      StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
-      EffectsModule.forFeature(coreEffects)
-    ),
   ]);
 };
 
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index d6295cf791..7a239dc8bc 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -33,6 +33,12 @@ import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-requ
 import { BrowserInitService } from './browser-init.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
 import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
+import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import { coreReducers } from '../../app/core/core.reducers';
+import { storeModuleConfig } from '../../app/app.reducer';
+import { CoreState } from '../../app/core/core-state.model';
+import { EffectsModule } from '@ngrx/effects';
+import { coreEffects } from '../../app/core/core.effects';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
@@ -56,6 +62,8 @@ export function getRequest(transferState: TransferState): any {
     StatisticsModule.forRoot(),
     Angulartics2RouterlessModule.forRoot(),
     BrowserAnimationsModule,
+    StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
+    EffectsModule.forFeature(coreEffects),
     BrowserTransferStateModule,
     TranslateModule.forRoot({
       loader: {
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index b3d718b0b2..4a54384c5a 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -37,6 +37,12 @@ import { XhrFactory } from '@angular/common';
 import { ServerXhrService } from '../../app/core/services/server-xhr.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
 import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
+import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import { coreReducers } from '../../app/core/core.reducers';
+import { storeModuleConfig } from '../../app/app.reducer';
+import { CoreState } from '../../app/core/core-state.model';
+import { EffectsModule } from '@ngrx/effects';
+import { coreEffects } from '../../app/core/core.effects';
 
 export function createTranslateLoader(transferState: TransferState) {
   return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json');
@@ -50,6 +56,8 @@ export function createTranslateLoader(transferState: TransferState) {
     }),
     NoopAnimationsModule,
     ServerTransferStateModule,
+    StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
+    EffectsModule.forFeature(coreEffects),
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,