diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 96140bbe9a..0b6ac5c208 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -656,7 +656,7 @@ export default class GridRow {
 
 		this.grid.visible_columns.forEach((col, ci) => {
 			// to get update df for the row
-			let df = fields.find((field) => field.fieldname === col[0].fieldname);
+			let df = fields.find((field) => field?.fieldname === col[0].fieldname);
 
 			this.set_dependant_property(df);
 
@@ -1360,7 +1360,7 @@ export default class GridRow {
 				: this.docfields;
 
 		let df = fields.find((col) => {
-			return col.fieldname === fieldname;
+			return col?.fieldname === fieldname;
 		});
 
 		// format values if no frm