diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 124da1b83..67c8fab75 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -462,10 +462,10 @@ sinkSubmission userId mExists isUpdate = do
             case isUpdate of
               False -> lift . insert_ $ SubmissionEdit userId now submissionId
               True  -> do
-                Submission{submissionRatingTime} <- lift $ getJust submissionId
-                when (isNothing submissionRatingTime) $ tellSt mempty { sinkSubmissionNotifyRating = Any True }
-                lift $ update submissionId [ SubmissionRatingBy =. Just userId, SubmissionRatingTime =. Just now ]
-                -- TODO: Should submissionRatingAssigned change here if userId changes?
+                Submission{submissionRatingTime, submissionRatingBy} <- lift $ getJust submissionId
+                when (submissionRatingBy == Just userId) $ do
+                  when (isNothing submissionRatingTime) $ tellSt mempty { sinkSubmissionNotifyRating = Any True }
+                  lift $ update submissionId [ SubmissionRatingTime =. Just now ]
             tellSt $ mempty{ sinkSubmissionTouched = Any True }
 
         finalize :: SubmissionSinkState -> YesodJobDB UniWorX ()