diff --git a/app/models/submission.rb b/app/models/submission.rb
index ef40ef68..f448adcd 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -71,7 +71,7 @@ class Submission < ApplicationRecord
      .and(Submitter.arel_table[:completed_at].eq(nil))).select(1).arel.exists)
   }
   scope :declined, -> { joins(:submitters).where.not(submitters: { declined_at: nil }).group(:id) }
-  scope :expired, -> { where(expire_at: ..Time.current) }
+  scope :expired, -> { pending.where(expire_at: ..Time.current) }
 
   enum :source, {
     invite: 'invite',
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index f7bc7a83..5d75a047 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -34,7 +34,7 @@
         <% submitter = submitters.first %>
         <div class="flex items-center space-x-4">
           <span class="flex flex-col md:flex-row md:items-center gap-3">
-            <% if submission.expired? %>
+            <% if submission.expired? && !submitter.completed_at? && !submitter.declined_at? %>
               <div class="tooltip flex" data-tip="<%= l(submission.expire_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
                 <span class="badge badge-error md:w-32 bg-opacity-50 badge-lg uppercase text-sm font-semibold">
                   <%= t('expired') %>