diff --git a/src-docs/src/views/datagrid/datagrid.js b/src-docs/src/views/datagrid/datagrid.js
index 3ee80026103..572d3d32d0a 100644
--- a/src-docs/src/views/datagrid/datagrid.js
+++ b/src-docs/src/views/datagrid/datagrid.js
@@ -279,6 +279,9 @@ export default () => {
             });
           }
         }
+        return () => {
+          setCellProps({});
+        };
       }, [rowIndex, columnId, setCellProps, data]);
 
       function getFormatted() {
diff --git a/src-docs/src/views/datagrid/footer_row.js b/src-docs/src/views/datagrid/footer_row.js
index 6d7a247ebe9..9825d69e114 100644
--- a/src-docs/src/views/datagrid/footer_row.js
+++ b/src-docs/src/views/datagrid/footer_row.js
@@ -92,6 +92,9 @@ export default () => {
             });
           }
         }
+        return () => {
+          setCellProps({});
+        };
       }, [rowIndex, columnId, setCellProps]);
 
       return raw_data.hasOwnProperty(rowIndex)