diff --git a/lib/submissions/ensure_audit_generated.rb b/lib/submissions/ensure_audit_generated.rb
index 19e1b186..eacb664b 100644
--- a/lib/submissions/ensure_audit_generated.rb
+++ b/lib/submissions/ensure_audit_generated.rb
@@ -17,6 +17,7 @@ module Submissions
 
       raise NotCompletedYet unless submission.submitters.all?(&:completed_at?)
 
+      total_wait_time ||= 0
       key = [KEY_PREFIX, submission.id].join(':')
 
       if ApplicationRecord.uncached { LockEvent.exists?(key:, event_name: :complete) }
@@ -39,7 +40,9 @@ module Submissions
     rescue ActiveRecord::RecordNotUnique
       sleep WAIT_FOR_RETRY
 
-      retry
+      total_wait_time += WAIT_FOR_RETRY
+
+      total_wait_time > CHECK_COMPLETE_TIMEOUT ? raise : retry
     rescue StandardError => e
       Rollbar.error(e) if defined?(Rollbar)
       Rails.logger.error(e)
diff --git a/lib/submissions/ensure_combined_generated.rb b/lib/submissions/ensure_combined_generated.rb
index d5c04853..4b55a4b7 100644
--- a/lib/submissions/ensure_combined_generated.rb
+++ b/lib/submissions/ensure_combined_generated.rb
@@ -17,6 +17,7 @@ module Submissions
 
       raise NotCompletedYet unless submitter.completed_at?
 
+      total_wait_time ||= 0
       key = [KEY_PREFIX, submitter.id].join(':')
 
       if ApplicationRecord.uncached { LockEvent.exists?(key:, event_name: :complete) }
@@ -38,8 +39,9 @@ module Submissions
       end
     rescue ActiveRecord::RecordNotUnique
       sleep WAIT_FOR_RETRY
+      total_wait_time += WAIT_FOR_RETRY
 
-      retry
+      total_wait_time > CHECK_COMPLETE_TIMEOUT ? raise : retry
     rescue StandardError => e
       Rollbar.error(e) if defined?(Rollbar)
       Rails.logger.error(e)
diff --git a/lib/submissions/ensure_result_generated.rb b/lib/submissions/ensure_result_generated.rb
index 29563d49..c59f6c73 100644
--- a/lib/submissions/ensure_result_generated.rb
+++ b/lib/submissions/ensure_result_generated.rb
@@ -16,6 +16,7 @@ module Submissions
 
       raise NotCompletedYet unless submitter.completed_at?
 
+      total_wait_time ||= 0
       key = ['result_attachments', submitter.id].join(':')
 
       return submitter.documents if ApplicationRecord.uncached { LockEvent.exists?(key:, event_name: :complete) }
@@ -35,8 +36,9 @@ module Submissions
       end
     rescue ActiveRecord::RecordNotUnique
       sleep WAIT_FOR_RETRY
+      total_wait_time += WAIT_FOR_RETRY
 
-      retry
+      total_wait_time > CHECK_COMPLETE_TIMEOUT ? raise : retry
     rescue StandardError => e
       Rollbar.error(e) if defined?(Rollbar)
       Rails.logger.error(e)