diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index a599ad1318..48b0a8897a 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -69,23 +69,43 @@ export class AppComponent {
                 public router: Router,
                 translate: AlfrescoTranslationService,
                 public alfrescoSettingsService: AlfrescoSettingsService) {
-        alfrescoSettingsService.bpmHost = this.bpmHost;
-        alfrescoSettingsService.ecmHost = this.ecmHost;
+        this.setEcmHost();
+        this.setBpmHost();
 
         this.translate = translate;
         this.translate.addTranslationFolder();
     }
 
+    private setEcmHost(){
+        if(localStorage.getItem(`ecmHost`)){
+            this.alfrescoSettingsService.ecmHost = localStorage.getItem(`ecmHost`);
+            this.ecmHost = localStorage.getItem(`ecmHost`);
+        }else{
+            this.alfrescoSettingsService.ecmHost = this.ecmHost;
+        }
+    }
+
+    private setBpmHost(){
+        if(localStorage.getItem(`bpmHost`)){
+            this.alfrescoSettingsService.bpmHost = localStorage.getItem(`bpmHost`);
+            this.bpmHost = localStorage.getItem(`bpmHost`);
+        }else{
+            this.alfrescoSettingsService.bpmHost = this.bpmHost;
+        }
+    }
+
     public onChangeECMHost(event: KeyboardEvent): void {
         console.log( (<HTMLInputElement>event.target).value);
         this.ecmHost = (<HTMLInputElement>event.target).value;
         this.alfrescoSettingsService.ecmHost = this.ecmHost;
+        localStorage.setItem(`ecmHost`, this.ecmHost);
     }
 
     public onChangeBPMHost(event: KeyboardEvent): void {
         console.log((<HTMLInputElement>event.target).value);
         this.bpmHost = (<HTMLInputElement>event.target).value;
         this.alfrescoSettingsService.bpmHost = this.bpmHost;
+        localStorage.setItem(`bpmHost`, this.bpmHost);
     }
 
     isActive(instruction: any[]): boolean {