diff --git a/packages/component-review/src/components/ReviewPage.js b/packages/component-review/src/components/ReviewPage.js
index 3b42c80703c07784bbcb2089be8ce82417fbfef8..880a86d37054dea4416791e464a697e90422f61f 100644
--- a/packages/component-review/src/components/ReviewPage.js
+++ b/packages/component-review/src/components/ReviewPage.js
@@ -48,7 +48,7 @@ const onSubmit = (
 
 const onChange = (values, dispatch, { project, version, reviewer }) => {
   Object.assign(reviewer, {
-    submitted: new Date(),
+    // submitted: new Date(),
     ...values,
   })
 
diff --git a/packages/component-review/src/components/review/ReviewLayout.js b/packages/component-review/src/components/review/ReviewLayout.js
index 6eae08e98de8120165c453f45ad419a495f425fd..b40fd0c91f834432ad1de291536e740995630108 100644
--- a/packages/component-review/src/components/review/ReviewLayout.js
+++ b/packages/component-review/src/components/review/ReviewLayout.js
@@ -65,7 +65,7 @@ const ReviewLayout = ({
   }, [])
 
   const review = currentVersion.reviewers.find(
-    review => review.reviewer === reviewer.id,
+    review => review.id === reviewer.id,
   )
 
   if (currentVersion.submitted && (!review || !review.submitted)) {