diff --git a/app/models/submission.rb b/app/models/submission.rb
index 5a8c90f2..8a7b75b7 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -96,8 +96,8 @@ class Submission < ApplicationRecord
   }
   scope :completed, -> { where.not(completed_at: nil) }
   scope :declined, lambda {
-    where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
-     .and(Submitter.arel_table[:declined_at].not_eq(nil))).select(1).arel.exists)
+    where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
+                   .where.not(declined_at: nil).limit(1).arel.exists)
   }
   scope :expired, -> { where(expire_at: ..Time.current).where(completed_at: nil) }
 
diff --git a/lib/submissions/filter.rb b/lib/submissions/filter.rb
index fc8d65e9..7da3f534 100644
--- a/lib/submissions/filter.rb
+++ b/lib/submissions/filter.rb
@@ -40,7 +40,6 @@ module Submissions
       submissions.where(created_by_user_id: user&.id || -1)
     end
 
-    # rubocop:disable Metrics/MethodLength
     def filter_by_status(submissions, filters)
       case filters[:status]
       when 'pending'
@@ -52,33 +51,24 @@ module Submissions
       when 'expired'
         submissions.expired
       when 'sent'
-        submissions.joins(:submitters)
-                   .where(submitters: { opened_at: nil, completed_at: nil, declined_at: nil })
-                   .where.not(submitters: { sent_at: nil })
-                   .group(:id)
+        submissions.where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
+                                   .where(opened_at: nil, completed_at: nil, declined_at: nil)
+                                   .where.not(sent_at: nil)
+                                   .limit(1).arel.exists)
       when 'opened'
-        submissions.joins(:submitters)
-                   .where(submitters: { completed_at: nil, declined_at: nil })
-                   .where.not(submitters: { opened_at: nil })
-                   .group(:id)
+        submissions.where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
+                                   .where(completed_at: nil, declined_at: nil)
+                                   .where.not(opened_at: nil)
+                                   .limit(1).arel.exists)
       when 'partially_completed'
-        submissions.joins(:submitters)
-                   .group(:id)
-                   .having(Arel::Nodes::NamedFunction.new(
-                     'COUNT', [Arel::Nodes::NamedFunction.new('NULLIF',
-                                                              [Submitter.arel_table[:completed_at].eq(nil),
-                                                               Arel::Nodes.build_quoted(false)])]
-                   ).gt(0))
-                   .having(Arel::Nodes::NamedFunction.new(
-                     'COUNT', [Arel::Nodes::NamedFunction.new('NULLIF',
-                                                              [Submitter.arel_table[:completed_at].not_eq(nil),
-                                                               Arel::Nodes.build_quoted(false)])]
-                   ).gt(0))
+        submissions.where(completed_at: nil)
+                   .where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
+                                   .where.not(completed_at: nil)
+                                   .limit(1).arel.exists)
       else
         submissions
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     def filter_by_created_at(submissions, filters)
       submissions = submissions.where(created_at: filters[:created_at_from]..) if filters[:created_at_from].present?