diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index b4cc7ff32d..703031afea 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
 
 import { SharedModule } from '../shared/shared.module';
 
diff --git a/src/app/+community-page/community-page.module.ts b/src/app/+community-page/community-page.module.ts
index 252fd3b2c6..bae083f085 100644
--- a/src/app/+community-page/community-page.module.ts
+++ b/src/app/+community-page/community-page.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { TranslateModule } from '@ngx-translate/core';
-
 import { SharedModule } from '../shared/shared.module';
 import { CommunityPageComponent } from './community-page.component';
 import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
diff --git a/src/app/+home/home.module.ts b/src/app/+home/home.module.ts
index 2941b9c6fd..546bed66fa 100644
--- a/src/app/+home/home.module.ts
+++ b/src/app/+home/home.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { TranslateModule } from '@ngx-translate/core';
-
 import { HomeComponent } from './home.component';
 import { HomeRoutingModule } from './home-routing.module';
 import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
diff --git a/src/app/browser-app.module.ts b/src/app/browser-app.module.ts
index dda60cf664..befc12ea45 100644
--- a/src/app/browser-app.module.ts
+++ b/src/app/browser-app.module.ts
@@ -45,6 +45,10 @@ export function createTranslateLoader(http: HttpClient) {
     HttpClientModule,
     IdlePreloadModule.forRoot(), // forRoot ensures the providers are only created once
     RouterModule.forRoot([], { useHash: false, preloadingStrategy: IdlePreload }),
+    BrowserCookiesModule,
+    BrowserDataLoaderModule,
+    BrowserTransferStateModule,
+    BrowserTransferStoreModule,
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
@@ -52,10 +56,6 @@ export function createTranslateLoader(http: HttpClient) {
         deps: [HttpClient]
       }
     }),
-    BrowserCookiesModule,
-    BrowserDataLoaderModule,
-    BrowserTransferStateModule,
-    BrowserTransferStoreModule,
     EffectsModule.forRoot([BrowserTransferStoreEffects]),
     StoreRouterConnectingModule,
     AppModule
diff --git a/src/app/server-app.module.ts b/src/app/server-app.module.ts
index b5aff68132..a3713b1885 100644
--- a/src/app/server-app.module.ts
+++ b/src/app/server-app.module.ts
@@ -46,7 +46,7 @@ export function boot(cache: TransferState, appRef: ApplicationRef, store: Store<
   };
 }
 export function createTranslateLoader() {
-  return new TranslateUniversalLoader('dist/assets/i18n', '.json');
+  return new TranslateUniversalLoader('dist/assets/i18n/', '.json');
 }
 
 @NgModule({
@@ -57,6 +57,11 @@ export function createTranslateLoader() {
     }),
     RouterModule.forRoot([], { useHash: false }),
     StoreRouterConnectingModule,
+    ServerModule,
+    ServerCookiesModule,
+    ServerDataLoaderModule,
+    ServerTransferStateModule,
+    ServerTransferStoreModule,
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
@@ -64,11 +69,6 @@ export function createTranslateLoader() {
         deps: []
       }
     }),
-    ServerModule,
-    ServerCookiesModule,
-    ServerDataLoaderModule,
-    ServerTransferStateModule,
-    ServerTransferStoreModule,
     EffectsModule.forRoot([ServerTransferStoreEffects]),
     AppModule
   ],
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 40c07b15d6..ab5ce4aa74 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -5,6 +5,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { NgxPaginationModule } from 'ngx-pagination';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
 import { TranslateModule } from '@ngx-translate/core';
 
 import { PaginationComponent } from './pagination/pagination.component';
@@ -26,12 +27,12 @@ import { TruncatePipe } from './utils/truncate.pipe';
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
   CommonModule,
-  RouterModule,
-  TranslateModule,
   FormsModule,
-  ReactiveFormsModule,
+  NgbModule,
   NgxPaginationModule,
-  NgbModule
+  ReactiveFormsModule,
+  RouterModule,
+  TranslateModule
 ];
 
 const PIPES = [
diff --git a/src/modules/translate-universal-loader.ts b/src/modules/translate-universal-loader.ts
index 803a754996..d569ef192d 100644
--- a/src/modules/translate-universal-loader.ts
+++ b/src/modules/translate-universal-loader.ts
@@ -4,11 +4,11 @@ import * as fs from 'fs';
 
 export class TranslateUniversalLoader implements TranslateLoader {
 
-  constructor(private prefix: string = 'i18n', private suffix: string = '.json') { }
+  constructor(private prefix: string = 'dist/assets/i18n/', private suffix: string = '.json') { }
 
   public getTranslation(lang: string): Observable<any> {
     return Observable.create((observer: any) => {
-      observer.next(JSON.parse(fs.readFileSync(`${this.prefix}/${lang}${this.suffix}`, 'utf8')));
+      observer.next(JSON.parse(fs.readFileSync(`${this.prefix}${lang}${this.suffix}`, 'utf8')));
       observer.complete();
     });
   }