diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts
index dfb3212e810..78076df46b3 100644
--- a/projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts
+++ b/projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts
@@ -7,7 +7,6 @@ export enum FilteringLogic {
     Or
 }
 
-/* tsPlainInterface */
 /* marshalByValue */
 /**
  * Represents filtering expressions.
diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts
index 229050379b4..9346de3bd8a 100644
--- a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts
+++ b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts
@@ -16,6 +16,7 @@ export declare interface IExpressionTree {
     returnFields?: string[] | null;
 }
 
+/* alternateBaseType: ExpressionTree */
 /* marshalByValue */
 export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpressionTree {
     filteringOperands: (IFilteringExpressionsTree | IFilteringExpression)[];
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
index 0b346c079b5..fe3099e111b 100644
--- a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -6608,10 +6608,10 @@ export abstract class IgxGridBaseDirective implements GridType,
             .filter((c) => c.pinned);
         this._unpinnedColumns = newColumns.filter((c) => !c.pinned);
         this._columns = newColumns;
-        if (this._columns && this._filteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._filteringExpressionsTree) {
             this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
         }
-        if (this._columns && this._advancedFilteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
             this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
         }
         this.resetCaches();
@@ -6676,10 +6676,10 @@ export abstract class IgxGridBaseDirective implements GridType,
         } else {
             this._columns = this.getColumnList();
         }
-        if (this._columns && this._filteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._filteringExpressionsTree) {
             this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
         }
-        if (this._columns && this._advancedFilteringExpressionsTree) {
+        if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
             this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
         }