diff --git a/app/views/form/_check_answers_summary_list.html.erb b/app/views/form/_check_answers_summary_list.html.erb
index ebf9fe8c0..a008e67d8 100644
--- a/app/views/form/_check_answers_summary_list.html.erb
+++ b/app/views/form/_check_answers_summary_list.html.erb
@@ -23,7 +23,7 @@
       <% if @log.collection_period_open? %>
         <% row.action(
           text: question.action_text(@log),
-          href: action_href(@log, question.page.id),
+          href: action_href(@log, question.page.id, referrer),
           visually_hidden_text: question.check_answer_label.to_s.downcase,
         ) %>
       <% end %>
diff --git a/app/views/form/_interruption_screen_question.html.erb b/app/views/form/_interruption_screen_question.html.erb
index 105d8e20a..6bfd482e2 100644
--- a/app/views/form/_interruption_screen_question.html.erb
+++ b/app/views/form/_interruption_screen_question.html.erb
@@ -5,40 +5,12 @@
 </h1>
 <div class="x-govuk-summary-card govuk-!-margin-bottom-6">
   <div class="x-govuk-summary-card__body">
-    <%= govuk_summary_list do |summary_list| %>
-      <% soft_validation_affected_questions(question, @log).each do |affected_question| %>
-      <% if affected_question.page.routed_to?(@log, current_user) %>
-          <% summary_list.row do |row| %>
-            <% row.key { get_question_label(affected_question) } %>
-            <% row.value do %>
-                <%= simple_format(
-                  get_answer_label(affected_question, @log),
-                  wrapper_tag: "span",
-                  class: "govuk-!-margin-right-4",
-                ) %>
-              <% extra_value = affected_question.get_extra_check_answer_value(@log) %>
-              <% if extra_value && affected_question.answer_label(@log, current_user).present? %>
-                <%= simple_format(
-                  extra_value,
-                  wrapper_tag: "span",
-                  class: "govuk-!-font-weight-regular app-!-colour-muted",
-                ) %>
-              <% end %>
-              <% affected_question.get_inferred_answers(@log).each do |inferred_answer| %>
-                <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
-              <% end %>
-            <% end %>
-            <% if @log.collection_period_open? %>
-              <% row.action(
-                text: affected_question.action_text(@log),
-                href: action_href(@log, affected_question.page.id, "interruption_screen"),
-                visually_hidden_text: affected_question.check_answer_label.to_s.downcase,
-              ) %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-    <% end %>
+
+    <%= render partial: "form/check_answers_summary_list", locals: {
+        lettings_log:,
+        questions: soft_validation_affected_questions(question, @log).filter { |q| q.page.routed_to?(@log, current_user) },
+        referrer: "interruption_screen",
+    } %>
   </div>
 </div>
 
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb
index e24659d8b..3267b4008 100644
--- a/app/views/form/check_answers.html.erb
+++ b/app/views/form/check_answers.html.erb
@@ -25,7 +25,8 @@
       <%= render partial: "form/check_answers_summary_list", locals: {
         subsection:,
         lettings_log: @log,
-        questions: total_applicable_questions(subsection, @log, current_user)
+        questions: total_applicable_questions(subsection, @log, current_user),
+        referrer: "check_answers",
       } %>
     <% end %>
 
diff --git a/app/views/form/review.html.erb b/app/views/form/review.html.erb
index 2d651f20d..e619da2f8 100644
--- a/app/views/form/review.html.erb
+++ b/app/views/form/review.html.erb
@@ -23,7 +23,7 @@
               <h3 class="x-govuk-summary-card__title"><%= subsection.label %></h3>
             </div>
             <div class="x-govuk-summary-card__body">
-              <%= render partial: "form/check_answers_summary_list", locals: { subsection:, questions: total_applicable_questions(subsection, @log, current_user), } %>
+              <%= render partial: "form/check_answers_summary_list", locals: { subsection:, questions: total_applicable_questions(subsection, @log, current_user), referrer: "check_answers" } %>
             </div>
           </div>
         <% end %>