diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 4a882b1d84..6a95469fd0 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -7,6 +7,14 @@ require "digest/sha1"
 task "uploads:gather" => :environment do
   require "db_helper"
 
+  ENV["RAILS_DB"] ? gather_uploads : gather_uploads_for_all_sites
+end
+
+def gather_uploads_for_all_sites
+  RailsMultisite::ConnectionManagement.each_connection { gather_uploads }
+end
+
+def gather_uploads
   public_directory = "#{Rails.root}/public"
   current_db = RailsMultisite::ConnectionManagement.current_db