diff --git a/projects/igniteui-angular/src/lib/grids/api.service.ts b/projects/igniteui-angular/src/lib/grids/api.service.ts
index 2a379c05c74..54cec4edca2 100644
--- a/projects/igniteui-angular/src/lib/grids/api.service.ts
+++ b/projects/igniteui-angular/src/lib/grids/api.service.ts
@@ -142,8 +142,9 @@ export class GridBaseAPIService<T extends GridType> implements GridServiceType {
             return;
         }
         const args = cell.createEditEventArgs(true);
-
-        this.grid.summaryService.clearSummaryCache(args);
+        if (!this.grid.crudService.row) {
+            this.grid.summaryService.clearSummaryCache(args);
+        }
         const data = this.getRowData(cell.id.rowID);
         const newRowData = reverseMapper(cell.column.field, args.newValue);
         this.updateData(this.grid, cell.id.rowID, data, cell.rowData, newRowData);
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts
index 053b350fd43..c23bd26207b 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts
@@ -1473,7 +1473,6 @@ describe('IgxGrid - Row Editing #grid', () => {
             summaryRow = fix.debugElement.query(By.css(SUMMARY_ROW));
             GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3,
                 ['Count', 'Earliest', 'Latest'], ['10', 'May 17, 1990', 'Dec 25, 2025']);
-
             GridFunctions.simulateGridContentKeydown(fix, 'enter');
             tick(16);
             fix.detectChanges();
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts
index 10293a58d97..4250c05e5f2 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts
@@ -778,6 +778,7 @@ describe('Edit cell with data of type Array #grid', () => {
 
         delete rowArgs.cancel;
         rowArgs.rowData = initialRowData;
+        rowArgs.data = initialRowData;
         expect(grid.rowEditDone.emit).toHaveBeenCalledTimes(1);
         expect(grid.rowEditDone.emit).toHaveBeenCalledWith(rowArgs);
 
diff --git a/projects/igniteui-angular/src/lib/grids/summaries/grid-summary.service.ts b/projects/igniteui-angular/src/lib/grids/summaries/grid-summary.service.ts
index 4bd63bfd915..ce0f8d227e4 100644
--- a/projects/igniteui-angular/src/lib/grids/summaries/grid-summary.service.ts
+++ b/projects/igniteui-angular/src/lib/grids/summaries/grid-summary.service.ts
@@ -33,6 +33,7 @@ export class IgxGridSummaryService {
             }
             return;
         }
+        debugger;
         if (args.data) {
             const rowID = this.grid.primaryKey ? args.data[this.grid.primaryKey] : args.data;
             this.removeSummaries(rowID);
@@ -190,6 +191,9 @@ export class IgxGridSummaryService {
             );
         }
         const rowData = this.grid.primaryKey ? data.find(rec => rec[this.grid.primaryKey] === rowID) : rowID;
+        if(!rowData) {
+            return summaryIDs;
+        }
         let id = '{ ';
         groupingExpressions.forEach(expr => {
             id += `'${expr.fieldName}': '${rowData[expr.fieldName]}'`;