diff --git a/app/models/badges/group_badge.rb b/app/models/badges/group_badge.rb
index c0712f452df98a79cdff129540a991854787fbd2..f74c9f89e9f4a85cdfa99f924df026068f27cb8a 100644
--- a/app/models/badges/group_badge.rb
+++ b/app/models/badges/group_badge.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class GroupBadge < Badge
+  include EachBatch
+
   belongs_to :group
 
   validates :group, presence: true
diff --git a/app/models/upload.rb b/app/models/upload.rb
index a4fbc70314633147465da311881dc11c57226efb..59ce9a1f37ada10fe5cb26f162496fde80411ca9 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -2,6 +2,7 @@
 
 class Upload < ApplicationRecord
   include Checksummable
+  include EachBatch
 
   # Upper limit for foreground checksum processing
   CHECKSUM_THRESHOLD = 100.megabytes