diff --git a/npm/ng-packs/packages/core/src/lib/services/list.service.ts b/npm/ng-packs/packages/core/src/lib/services/list.service.ts
index aff51daa1c..76dac87b5a 100644
--- a/npm/ng-packs/packages/core/src/lib/services/list.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/list.service.ts
@@ -132,15 +132,17 @@ export class ListService<QueryParamsType = ABP.PageQueryParams | any> implements
   }
 
   private resetPageWhenUnchanged() {
-    const maxPage = Number(Number(this._totalCount / this._maxResultCount).toFixed()) // 2
-    const skipCount = this._page * this._maxResultCount; // 20
-    if(skipCount === this._totalCount){
-      if(this.page === maxPage && this.page > 0){
-        this._skipCount = skipCount - this._maxResultCount
-        this.page = this.page - 1;
-      }
-    }else{
+    const maxPage = Number(Number(this.totalCount / this._maxResultCount).toFixed());
+    const skipCount = this._page * this._maxResultCount;
+
+    if (skipCount !== this._totalCount) {
       this._skipCount = skipCount;
+      return;
+    }
+
+    if (this.page === maxPage && this.page > 0) {
+      this._skipCount = skipCount - this._maxResultCount;
+      this.page = this.page - 1;
     }
   }
 
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
index ae76565aa8..aa264385be 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
@@ -150,7 +150,11 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
 
   ngOnChanges({ data }: SimpleChanges) {
     if (!data?.currentValue) return;
-    this.list.totalCount = this.recordsTotal
+    
+    if (data.currentValue.length < 1) {
+      this.list.totalCount = this.recordsTotal
+    }
+
     this.data = data.currentValue.map((record: any, index: number) => {
       this.propList.forEach(prop => {
         const propData = { getInjected: this.getInjected, record, index } as any;