diff --git a/src/portal/src/app/base/left-side-nav/projects/projects.component.ts b/src/portal/src/app/base/left-side-nav/projects/projects.component.ts
index 6570e1512..52fa3e130 100644
--- a/src/portal/src/app/base/left-side-nav/projects/projects.component.ts
+++ b/src/portal/src/app/base/left-side-nav/projects/projects.component.ts
@@ -42,9 +42,6 @@ export class ProjectsComponent implements OnInit, OnDestroy {
 
   currentFilteredType: number = 0; // all projects
   projectName: string = "";
-
-  loading: boolean = true;
-
   get selecteType(): string {
     return this.currentFilteredType + "";
   }
@@ -82,7 +79,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
               this.listProject.currentPage = 1;
               this.listProject.searchKeyword = projectName;
               this.listProject.selectedRow = [];
-              this.loading = true;
+              this.listProject.loading = true;
               let passInFilteredType: number = undefined;
               if (this.listProject.filteredType > 0) {
                   passInFilteredType = this.listProject.filteredType - 1;
@@ -90,7 +87,7 @@ export class ProjectsComponent implements OnInit, OnDestroy {
             return this.proService.listProjects( this.listProject.searchKeyword,
                 passInFilteredType,  this.listProject.currentPage, this.listProject.pageSize, getSortingString(this.listProject.state))
                 .pipe(finalize(() => {
-                  this.loading = false;
+                  this.listProject.loading = false;
                 }));
           })).subscribe(response => {
                 // Get total count
diff --git a/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
index e2773aba9..c2eda74a5 100644
--- a/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
+++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
@@ -191,7 +191,7 @@ export class ChartVersionComponent implements OnInit {
       }))
       .subscribe(
         versions => {
-          this.chartVersions = versions.filter(x => x.version.includes(this.lastFilteredVersionName));
+          this.chartVersions = versions.filter(x => x?.version?.includes(this.lastFilteredVersionName));
           this.totalCount = versions.length;
         },
         err => {