diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 74e1e92e1..3077a1554 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -485,6 +485,7 @@ submissionHelper tid ssh csh shn mcid = do
 
         E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate))
              E.&&. (sf2 E.?. SubmissionFileIsUpdate E.==. E.val (Just True)  E.||. E.isNothing (sf2 E.?. SubmissionFileIsUpdate))
+             E.&&. (sf2 E.?. SubmissionFileIsDeletion E.==. E.val (Just False)  E.||. E.isNothing (sf2 E.?. SubmissionFileIsDeletion))
              E.&&. (sf1 E.?. SubmissionFileSubmission E.==. E.val (Just smid) E.||. sf2 E.?. SubmissionFileSubmission E.==. E.val (Just smid))
 
         return ((sf1, f1), (sf2, f2))
@@ -546,6 +547,7 @@ getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) pat
         return f
 
       case results of
+        [] -> notFound
         [Entity _ File{ fileContent = Just c, fileTitle }] -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index c65ae308b..b8d158f06 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -510,7 +510,6 @@ sinkSubmission userId mExists isUpdate = do
               -> update submissionId
               [ SubmissionRatingTime =. Nothing
               , SubmissionRatingPoints =. Nothing
-              , SubmissionRatingBy =. Nothing
               , SubmissionRatingComment =. Nothing
               ]
             | isUpdate