diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index 9cfd20909..98bd2d62f 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -68,12 +68,12 @@ module SchemesHelper
     end
   end
 
-  def primary_schemes_csv_download_url(download_type)
-    csv_download_schemes_path(search: @searched, download_type:)
+  def primary_schemes_csv_download_url(search, download_type)
+    csv_download_schemes_path(search:, download_type:)
   end
 
-  def secondary_schemes_csv_download_url(download_type)
-    schemes_csv_download_organisation_path(@organisation, search: @searched, download_type:)
+  def secondary_schemes_csv_download_url(organisation, search, download_type)
+    schemes_csv_download_organisation_path(organisation, search:, download_type:)
   end
 
 private
diff --git a/app/views/organisations/schemes.html.erb b/app/views/organisations/schemes.html.erb
index 2f38d78da..58b16243a 100644
--- a/app/views/organisations/schemes.html.erb
+++ b/app/views/organisations/schemes.html.erb
@@ -28,9 +28,9 @@
     <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
 
     <% if current_user.support? %>
-      <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: secondary_schemes_csv_download_url("schemes"), locations_csv_download_url: secondary_schemes_csv_download_url("locations"), combined_csv_download_url: secondary_schemes_csv_download_url("combined") } %>
+      <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: secondary_schemes_csv_download_url(@organisation, @searched, "schemes"), locations_csv_download_url: secondary_schemes_csv_download_url(@organisation, @searched, "locations"), combined_csv_download_url: secondary_schemes_csv_download_url(@organisation, @searched, "combined") } %>
     <% else %>
-      <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: primary_schemes_csv_download_url("schemes"), locations_csv_download_url: primary_schemes_csv_download_url("locations"), combined_csv_download_url: primary_schemes_csv_download_url("combined") } %>
+      <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: primary_schemes_csv_download_url(@searched, "schemes"), locations_csv_download_url: primary_schemes_csv_download_url(@searched, "locations"), combined_csv_download_url: primary_schemes_csv_download_url(@searched, "combined") } %>
     <% end %>
 
     <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "schemes" } %>
diff --git a/app/views/schemes/index.html.erb b/app/views/schemes/index.html.erb
index 3ee8c802c..d0ae44072 100644
--- a/app/views/schemes/index.html.erb
+++ b/app/views/schemes/index.html.erb
@@ -15,7 +15,7 @@
 
     <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
 
-    <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: primary_schemes_csv_download_url("schemes"), locations_csv_download_url: primary_schemes_csv_download_url("locations"), combined_csv_download_url: primary_schemes_csv_download_url("combined") } %>
+    <%= render partial: "schemes/scheme_list", locals: { schemes: @schemes, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, schemes_csv_download_url: primary_schemes_csv_download_url(@searched, "schemes"), locations_csv_download_url: primary_schemes_csv_download_url(@searched, "locations"), combined_csv_download_url: primary_schemes_csv_download_url(@searched, "combined") } %>
 
     <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "schemes" } %>
   </div>