diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb
index ef735dfd..142b86bf 100644
--- a/app/controllers/api/submissions_controller.rb
+++ b/app/controllers/api/submissions_controller.rb
@@ -112,9 +112,9 @@ module Api
       submissions = submissions.where(slug: params[:slug]) if params[:slug].present?
 
       if params[:template_folder].present?
-        folder = TemplateFolder.accessible_by(current_ability).find_by(name: params[:template_folder])
+        folder_ids = TemplateFolder.accessible_by(current_ability).where(name: params[:template_folder]).pluck(:id)
 
-        submissions = folder ? submissions.joins(:template).where(template: { folder_id: folder.id }) : submissions.none
+        submissions = submissions.joins(:template).where(template: { folder_id: folder_ids })
       end
 
       if params.key?(:archived)
diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb
index 2af022e7..d14be35e 100644
--- a/app/controllers/api/templates_controller.rb
+++ b/app/controllers/api/templates_controller.rb
@@ -95,9 +95,9 @@ module Api
       templates = templates.where(slug: params[:slug]) if params[:slug].present?
 
       if params[:folder].present?
-        folder = TemplateFolder.accessible_by(current_ability).find_by(name: params[:folder])
+        folder_ids = TemplateFolder.accessible_by(current_ability).where(name: params[:folder]).pluck(:id)
 
-        templates = folder ? templates.where(folder:) : templates.none
+        templates = templates.where(folder_id: folder_ids)
       end
 
       templates