diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index e63ee99572..53d7dbb042 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -29,8 +29,8 @@ declare var document: any;
 export class AppComponent {
     searchTerm: string = '';
 
-    ecmHost: string = `http://${window.location.hostname}:${window.location.port}/ecm`;
-    bpmHost: string = `http://${window.location.hostname}:${window.location.port}/bpm`;
+    ecmHost: string = `http://${window.location.hostname}` + (window.location.port ? `:${window.location.port}` : '') + `/ecm`;
+    bpmHost: string = `http://${window.location.hostname}` + (window.location.port ? `:${window.location.port}` : '') + `/bpm`;
 
     constructor(private authService: AlfrescoAuthenticationService,
                 private router: Router,