diff --git a/app/controllers/submit_form_completed_download_controller.rb b/app/controllers/submit_form_completed_download_controller.rb
index 6f959d0d..fc27ab71 100644
--- a/app/controllers/submit_form_completed_download_controller.rb
+++ b/app/controllers/submit_form_completed_download_controller.rb
@@ -17,11 +17,11 @@ class SubmitFormCompletedDownloadController < ApplicationController
         @submitter = nil
       end
 
-    @submitter ||= Submitter.find_by!(slug: submitter_slug)
+    @submitter ||= Submitter.completed.find_by!(slug: submitter_slug)
 
     Submissions::EnsureResultGenerated.call(@submitter) if @submitter.completed_at?
 
-    last_submitter = @submitter.submission.submitters.where.not(completed_at: nil).order(:completed_at).last
+    last_submitter = @submitter.submission.submitters.completed.order(:completed_at).last
 
     return head :not_found unless last_submitter