diff --git a/platform/ui/src/components/StudyListTable/StudyListTableRow.js b/platform/ui/src/components/StudyListTable/StudyListTableRow.js
index 67db2ab56..01c6e7893 100644
--- a/platform/ui/src/components/StudyListTable/StudyListTableRow.js
+++ b/platform/ui/src/components/StudyListTable/StudyListTableRow.js
@@ -39,7 +39,7 @@ const StudyListTableRow = props => {
 
                     return (
                       <td
-                        key={name}
+                        key={index}
                         className={classnames(
                           'px-4 py-2 text-base truncate',
                           { 'border-b border-secondary-light': !isExpanded },
diff --git a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
index 5faeebb39..0a8aad35a 100644
--- a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
+++ b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
@@ -164,6 +164,7 @@ function StudyListContainer({ history, data: studies }) {
   };
   const tableDataSource = studies
     // TOOD: Move sort to DataSourceWrapper?
+    // TODO: MOTIVATION, this is triggered on every render, even if list/sort does not change
     .sort((s1, s2) => {
       const noSortApplied = sortBy === '' || !sortBy;
       const sortModifier = sortDirection === 'descending' ? 1 : -1;