diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index e522c55c5a..588fe546d6 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -197,14 +197,14 @@
 			let idx = Number(event.node.data['__index'].split('-')[0])
 			uid = prevUid ?? ''
 			outputs?.newChange?.set({
-				row: event.node.rowIndex,
+				row: idx,
 				column: event.colDef.field,
 				value: dataCell,
 				old: result[idx][event.colDef.field]
 			})
 			result[idx][event.colDef.field] = dataCell
 
-			let data = { ...result[event.node.rowIndex] }
+			let data = { ...result[idx] }
 			outputs?.selectedRow?.set(data)
 			resolvedConfig?.extraConfig?.['defaultColDef']?.['onCellValueChanged']?.(event)
 		}