diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.html
index fa8f7df3da..da17512ea1 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.html
@@ -1,4 +1,4 @@
-<ol *ngIf="show" class="breadcrumb">
+<ol class="breadcrumb" *ngIf="segments.length">
   <li class="breadcrumb-item">
     <a routerLink="/"><i class="fa fa-home"></i> </a>
   </li>
@@ -8,6 +8,6 @@
     [class.active]="last"
     aria-current="page"
   >
-    {{ segment | abpLocalization }}
+    {{ segment.name | abpLocalization }}
   </li>
 </ol>
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
index 27fd96a201..4a3b6e12da 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb/breadcrumb.component.ts
@@ -1,56 +1,52 @@
-import { ABP, ConfigState } from '@abp/ng.core';
-import { Component, Input, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { Store } from '@ngxs/store';
+import { ABP, getRoutePath, RoutesService, takeUntilDestroy, TreeNode } from '@abp/ng.core';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { filter, map, startWith } from 'rxjs/operators';
 
 @Component({
   selector: 'abp-breadcrumb',
   templateUrl: './breadcrumb.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BreadcrumbComponent implements OnInit {
-  @Input()
-  segments: string[] = [];
+export class BreadcrumbComponent implements OnDestroy, OnInit {
+  segments: Partial<ABP.Route>[] = [];
 
-  show: boolean;
+  constructor(
+    public readonly cdRef: ChangeDetectorRef,
+    private router: Router,
+    private routes: RoutesService,
+  ) {}
 
-  constructor(private router: Router, private store: Store) {}
+  ngOnDestroy() {}
 
   ngOnInit(): void {
-    this.show = !!this.store.selectSnapshot(state => state.LeptonLayoutState);
-
-    if (this.show && !this.segments.length) {
-      let splittedUrl = this.router.url.split('/').filter(chunk => chunk);
-
-      let currentUrl: ABP.FullRoute = this.store.selectSnapshot(
-        ConfigState.getRoute(splittedUrl[0]),
-      );
-
-      if (!currentUrl) {
-        currentUrl = this.store.selectSnapshot(ConfigState.getRoute(null, null, this.router.url));
-        splittedUrl = [this.router.url];
-        if (!currentUrl) {
-          this.show = false;
-          return;
-        }
-      }
-
-      this.segments.push(currentUrl.name);
-
-      if (splittedUrl.length > 1) {
-        const [, ...arr] = splittedUrl;
-
-        let childRoute: ABP.FullRoute = currentUrl;
-        for (let i = 0; i < arr.length; i++) {
-          const element = String(arr[i])
-            .split(/[?#(]/)
-            .shift();
-          if (!childRoute.children || !childRoute.children.length) return;
-
-          childRoute = childRoute.children.find(child => child.path === element);
-
-          this.segments.push(childRoute.name);
+    this.router.events
+      .pipe(
+        takeUntilDestroy(this),
+        filter<NavigationEnd>(event => event instanceof NavigationEnd),
+        // tslint:disable-next-line:deprecation
+        startWith(null),
+        map(() => this.routes.search({ path: getRoutePath(this.router) })),
+      )
+      .subscribe(route => {
+        this.segments = [];
+        if (route) {
+          let node = { parent: route } as TreeNode<ABP.Route>;
+
+          while (node.parent) {
+            node = node.parent;
+            const { parent, children, ...segment } = node;
+            this.segments.unshift(segment);
+          }
+
+          this.cdRef.detectChanges();
         }
-      }
-    }
+      });
   }
 }