diff --git a/Gemfile.lock b/Gemfile.lock
index 9b4c26766..0b5889599 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera/bulkrax.git
-  revision: a751f48d45478c67bff4e4cb07ca1b3d01d6131a
+  revision: 0e8de6174cd305bfdccdfbb8dd090c7c446f763d
   branch: main
   specs:
     bulkrax (9.0.2)
diff --git a/app/services/hyrax/user_stat_importer_decorator.rb b/app/services/hyrax/user_stat_importer_decorator.rb
new file mode 100644
index 000000000..aa9d7de05
--- /dev/null
+++ b/app/services/hyrax/user_stat_importer_decorator.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v5.0.1 to use Hyrax.query_service to find the fileset instead of FileSet.find
+#   Remove this if https://github.com/samvera/hyrax/pull/6992 gets merged and Hyrax is updated appropriately
+
+module Hyrax
+  module UserStatImporterDecorator
+    private
+
+    def process_files(stats, user, start_date)
+      file_ids_for_user(user).each do |file_id|
+        file = Hyrax.query_service.find_by(id: file_id)
+        view_stats = extract_stats_for(object: file, from: FileViewStat, start_date: start_date, user: user)
+        stats = tally_results(view_stats, :views, stats) if view_stats.present?
+        delay
+        dl_stats = extract_stats_for(object: file, from: FileDownloadStat, start_date: start_date, user: user)
+        stats = tally_results(dl_stats, :downloads, stats) if dl_stats.present?
+        delay
+      end
+    end
+  end
+end
+
+Hyrax::UserStatImporter.prepend(Hyrax::UserStatImporterDecorator)