diff --git a/packages/react-data-grid/src/Row.js b/packages/react-data-grid/src/Row.js
index 348465f50c..2c93a02a45 100644
--- a/packages/react-data-grid/src/Row.js
+++ b/packages/react-data-grid/src/Row.js
@@ -56,7 +56,7 @@ class Row extends React.Component {
     e.preventDefault();
   };
 
-  getCell = (column, i) => {
+  getCell = (column) => {
     const CellRenderer = this.props.cellRenderer;
     const { idx, cellMetaData, isScrolling, row, isSelected, scrollLeft, lastFrozenColumnIndex } = this.props;
     const { key, formatter } = column;
@@ -66,7 +66,7 @@ class Row extends React.Component {
       ref: (node) => {
         this[key] = node;
       },
-      value: this.getCellValue(key || i),
+      value: this.getCellValue(key || column.idx),
       rowData: row,
       isRowSelected: isSelected,
       expandableOptions: this.getExpandableOptions(key),