diff --git a/client/app/components/AmaIssueList.jsx b/client/app/components/AmaIssueList.jsx
index 45a5fba8938..e4bd42001ec 100644
--- a/client/app/components/AmaIssueList.jsx
+++ b/client/app/components/AmaIssueList.jsx
@@ -62,7 +62,7 @@ export default class AmaIssueList extends React.PureComponent {
       {requestIssues.map((issue, i) => {
         const error = errorMessages && errorMessages[issue.id];
 
-        return <React.Fragment>
+        return <React.Fragment key={`ama-issue-${i}`}>
           { error &&
             <span className="usa-input-error-message" tabIndex={0}>
               {error}
diff --git a/client/app/queue/components/TaskRows.jsx b/client/app/queue/components/TaskRows.jsx
index 423aef3772b..343e9db01cd 100644
--- a/client/app/queue/components/TaskRows.jsx
+++ b/client/app/queue/components/TaskRows.jsx
@@ -532,6 +532,7 @@ class TaskRows extends React.PureComponent {
               timeline,
               taskList,
               index,
+              key: `${timelineEvent?.type}-${index}`
             });
           }