diff --git a/src/pages/SupplierInvoicePage.js b/src/pages/SupplierInvoicePage.js
index e44350226..19c5a5819 100644
--- a/src/pages/SupplierInvoicePage.js
+++ b/src/pages/SupplierInvoicePage.js
@@ -211,6 +211,7 @@ export class SupplierInvoicePage extends React.Component {
       case 'expiryDate': {
         return (
           <ExpiryTextInput
+            key={transactionBatch.id}
             isEditable={isEditable}
             onEndEditing={(newValue) => this.onEndEditing(key, transactionBatch, newValue)}
             text={transactionBatch[key]}
diff --git a/src/pages/expansions/StocktakeEditExpansion.js b/src/pages/expansions/StocktakeEditExpansion.js
index 03e72243a..74831fd2f 100644
--- a/src/pages/expansions/StocktakeEditExpansion.js
+++ b/src/pages/expansions/StocktakeEditExpansion.js
@@ -81,7 +81,7 @@ export class StocktakeEditExpansion extends React.Component {
       case 'expiryDate': {
         return (
           <ExpiryTextInput
-            key={key}
+            key={stocktakeBatch.id}
             isEditable={isEditable}
             onEndEditing={(newValue) => {
               this.onEndEditing(key, stocktakeBatch, newValue);