diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index fb3eec3adb609e937edafa1a2c465446e5a5b9f2..e0edaec89324e48efb4369286f98204860704e85 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -2,10 +2,13 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../environments/environment';
 import { IAppConfig } from './models/app-config.model';
+import { LocalStorageShareService } from './services/http/local-storage-share.service';
+
 @Injectable()
 export class AppConfig {
     static settings: IAppConfig;
-    constructor(private http: HttpClient) {}
+    constructor(private http: HttpClient, private localStorageShareService: LocalStorageShareService) {
+    }
     load() {
         const jsonFile = `assets/config/config.${environment.name}.json`;
         return new Promise<void>((resolve, reject) => {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 658a12fe783f2ec5ccc615ae388b1f6c18aa9603..ee0157fe4eeac8b4e7458764790230847b041ab5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { AppComponent } from './app.component';
 import { RegisterComponent } from './components/home/_dialogs/register/register.component';
 import { PasswordResetComponent } from './components/home/_dialogs/password-reset/password-reset.component';
@@ -149,11 +149,11 @@ export function initializeApp(appConfig: AppConfig) {
     QuillModule.forRoot()
   ],
   providers: [
-    /*AppConfig,
+    AppConfig,
     { provide: APP_INITIALIZER,
       useFactory: initializeApp,
       deps: [AppConfig], multi: true
-    },*/
+    },
     {
       provide: HTTP_INTERCEPTORS,
       useClass: AuthenticationInterceptor,
diff --git a/src/app/services/http/local-storage-share.service.ts b/src/app/services/http/local-storage-share.service.ts
index 9c58ad310825e0dbc112fe89bb3fdeeb55be52de..f8e50eb68d3c061b444aa96c1c9f89c99a4443ac 100644
--- a/src/app/services/http/local-storage-share.service.ts
+++ b/src/app/services/http/local-storage-share.service.ts
@@ -11,14 +11,17 @@ export class LocalStorageShareService {
 
   messageHandler(event) {
     const { action, key, value} = event.data;
-    if (action == 'save') {
+    if (action === 'save') {
       window.localStorage.setItem(key, JSON.stringify(value));
-    } else if (action == 'get') {
-      event.source.postMessage({
-        action: 'returnData',
-        key,
-        JSON.parse(window.localStorage.getItem(key))
-      }, '*')
+    } else if (action === 'get') {
+      const obj = JSON.parse(window.localStorage.getItem(key));
+      if(obj !== null) {
+        event.source.postMessage({
+          action: 'returnData',
+          key,
+          obj
+        }, '*');
+      }
     }
   }
 }