diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index d5ba24e23..0bd127063 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { GuardsCheckStart, Router } from '@angular/router'
+import { GuardsCheckStart, Router, NavigationEnd } from '@angular/router'
 import { AuthService, RedirectService, ServerService } from '@app/core'
 import { isInSmallView } from '@app/shared/misc/utils'
 
@@ -50,10 +50,14 @@ export class AppComponent implements OnInit {
   ngOnInit () {
     document.getElementById('incompatible-browser').className += ' browser-ok'
 
-    const pathname = window.location.pathname
-    if (!pathname || pathname === '/') {
-      this.redirectService.redirectToHomepage()
-    }
+    this.router.events.subscribe(e => {
+      if (e instanceof NavigationEnd) {
+        const pathname = window.location.pathname
+        if (!pathname || pathname === '/') {
+          this.redirectService.redirectToHomepage()
+        }
+      }
+    })
 
     this.authService.loadClientCredentials()