diff --git a/projects/igniteui-angular/grids/tree-grid/src/tree-grid-api.service.ts b/projects/igniteui-angular/grids/tree-grid/src/tree-grid-api.service.ts
index a7d710f48c3..69852accbe3 100644
--- a/projects/igniteui-angular/grids/tree-grid/src/tree-grid-api.service.ts
+++ b/projects/igniteui-angular/grids/tree-grid/src/tree-grid-api.service.ts
@@ -83,7 +83,7 @@ export class IgxTreeGridAPIService extends GridBaseAPIService<GridType> {
         if (expanded !== undefined) {
             return expanded;
         } else {
-            return record.children && record.children.length && record.level < grid.expansionDepth;
+            return record.children && !!record.children.length && record.level < grid.expansionDepth;
         }
     }
 
diff --git a/projects/igniteui-angular/grids/tree-grid/src/tree-grid-expanding.spec.ts b/projects/igniteui-angular/grids/tree-grid/src/tree-grid-expanding.spec.ts
index b1ab72d1c22..ca1eb880355 100644
--- a/projects/igniteui-angular/grids/tree-grid/src/tree-grid-expanding.spec.ts
+++ b/projects/igniteui-angular/grids/tree-grid/src/tree-grid-expanding.spec.ts
@@ -44,6 +44,15 @@ describe('IgxTreeGrid - Expanding / Collapsing #tGrid', () => {
             treeGrid = fix.componentInstance.treeGrid;
         });
 
+        it('should return boolean for expand state of row without children using getRowByKey()', () => {
+            treeGrid.primaryKey = "ID";
+            treeGrid.childDataKey = "";
+            fix.detectChanges();
+
+            const testRow = treeGrid.getRowByKey(147);
+            expect(testRow.expanded).toEqual(false);
+        });
+
         it('check row expanding and collapsing are changing rows count (UI)', () => {
             let rows = TreeGridFunctions.getAllRows(fix);
             expect(rows.length).toBe(4);