diff --git a/package-lock.json b/package-lock.json
index ecc3fe1f8..ebadc9e53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11256,11 +11256,6 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
       "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
     },
-    "query-params": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/query-params/-/query-params-0.0.1.tgz",
-      "integrity": "sha1-CvBO69Y7JmsOCXHRBODcTOVYxgQ="
-    },
     "query-string": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
diff --git a/package.json b/package.json
index 8f8d745a3..4b6d957e1 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
   "dependencies": {
     "axios": "^0.17.1",
     "classnames": "^2.2.5",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
     "jspdf": "^1.3.5",
     "jwt-decode": "^2.2.0",
     "lodash.debounce": "^4.0.8",
@@ -24,8 +26,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.2.0",
     "semantic-ui-react": "^0.78.2",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1"
+    "uniqid": "^4.1.1"
   },
   "devDependencies": {
     "@types/jest": "^22.2.2",
diff --git a/src/components/rangeUsePlan/edit/EditRupSchedule.js b/src/components/rangeUsePlan/edit/EditRupSchedule.js
index fd68da8a6..6462ee72c 100644
--- a/src/components/rangeUsePlan/edit/EditRupSchedule.js
+++ b/src/components/rangeUsePlan/edit/EditRupSchedule.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import uniqid from 'uniqid';
 import { Table, Button, Icon, TextArea, Form, Dropdown } from 'semantic-ui-react';
 import { calcCrownTotalAUMs, roundTo1Decimal } from '../../../handlers';
 import {
@@ -129,7 +130,7 @@ class EditRupSchedule extends Component {
     });
 
     return grazingScheduleEntries.map((entry, entryIndex) => {
-      const key = `schedule${scheduleIndex}entry${entryIndex}${new Date()}`;
+      const key = uniqid(`schedule${scheduleIndex}entry${entryIndex}`);
       return (
         <EditRupScheduleEntry
           key={key}
diff --git a/src/components/rangeUsePlan/edit/EditRupSchedules.js b/src/components/rangeUsePlan/edit/EditRupSchedules.js
index a585304f7..73b3a36bc 100644
--- a/src/components/rangeUsePlan/edit/EditRupSchedules.js
+++ b/src/components/rangeUsePlan/edit/EditRupSchedules.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import uniqid from 'uniqid';
 import { Dropdown } from 'semantic-ui-react';
 import { NOT_PROVIDED } from '../../../constants/strings';
 import EditRupSchedule from './EditRupSchedule';
@@ -161,7 +162,7 @@ class EditRupSchedules extends Component {
       isDeletingScheduleEntry,
     } = this.props;
     const { yearOptions, activeScheduleIndex } = this.state;
-    const key = `schedule${schedule.year}${new Date()}`;
+    const key = uniqid(`schedule${scheduleIndex}`);
 
     return (
       <EditRupSchedule