diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 85e5eebb9e..7f61bec9f3 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -423,6 +423,7 @@ export class AuthService {
         } else {
           // If redirectUrl is empty use history.
           this.routeService.getHistory().pipe(
+            filter((history) => history.length > 0),
             take(1)
           ).subscribe((history) => {
             let redirUrl;