diff --git a/app/lib/disclosure_downloader.rb b/app/lib/disclosure_downloader.rb
index 6fb9fc1..c2968d3 100644
--- a/app/lib/disclosure_downloader.rb
+++ b/app/lib/disclosure_downloader.rb
@@ -7,11 +7,11 @@ def initialize(agency = NetfileAgency.coak)
   end
 
   def download
-    latest = Filing.order(filed_at: :desc).first
+    latest = Filing.where(netfile_agency: @agency).order(filed_at: :desc).first
     puts '==================================================================='
-    puts 'Beginning State:'
+    puts "Beginning State for Netfile agency #{@agency.shortcut}:"
     puts
-    puts "Filings: #{Filing.count}"
+    puts "Filings: #{Filing.where(netfile_agency: @agency).count}"
     puts "Latest: #{latest&.filed_at}"
     puts '==================================================================='
 
@@ -47,11 +47,11 @@ def download
       end
     end
 
-    latest = Filing.order(filed_at: :desc).first
+    latest = Filing.where(netfile_agency: @agency).order(filed_at: :desc).first
     puts '==================================================================='
     puts 'Ending State:'
     puts
-    puts "Filings: #{Filing.count}"
+    puts "Filings: #{Filing.where(netfile_agency: @agency).count}"
     puts "Latest: #{latest&.filed_at}"
     puts '==================================================================='
   end
diff --git a/lib/tasks/disclosure_alert.rake b/lib/tasks/disclosure_alert.rake
index befa964..40686ee 100644
--- a/lib/tasks/disclosure_alert.rake
+++ b/lib/tasks/disclosure_alert.rake
@@ -13,13 +13,17 @@ namespace :disclosure_alert do
 
   desc 'Download latest records'
   task download: :environment do
-    DisclosureDownloader.new.download
+    NetfileAgency.each_supported_agency do |agency|
+      DisclosureDownloader.new(agency).download
+    end
   end
 
   desc 'Download latest records and send email'
   task download_and_email_daily: :with_configuration do
     today = TZInfo::Timezone.get('America/Los_Angeles').now.to_date
-    DisclosureDownloader.new.download
+    NetfileAgency.each_supported_agency do |agency|
+      DisclosureDownloader.new(agency).download
+    end
     DisclosureEmailer.new(today - 1).send_email
   end