diff --git a/CHANGELOG b/CHANGELOG
index fea56a6ef2171be49fff70d77790d6925ccf6726..1d42acfe3631e0eff5a7af21232f45491a43323b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.12.0 (unreleased)
   - Add ability to fork to a specific namespace using API. (ritave)
   - Cleanup misalignments in Issue list view !6206
+  - Prune events older than 12 months. @ritave <olaf@tomalka.me>
   - Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
   - Prune events older than 12 months.
   - Filter tags by name !6121
diff --git a/app/workers/prune_old_events_worker.rb b/app/workers/prune_old_events_worker.rb
index a0182fc67d05200f1e533c02d04e9ccf5db7a33f..d75083f9ab198c576d9e9bfd32b54808aa68bb02 100644
--- a/app/workers/prune_old_events_worker.rb
+++ b/app/workers/prune_old_events_worker.rb
@@ -3,6 +3,6 @@ class PruneOldEventsWorker
 
   def perform
     # Contribution calendar shows maximum 12 months of events
-    Event.where('created_at < ?', (12.months + 1.day).ago).destroy_all
+    Event.delete(Event.unscoped.where('created_at < ?', (12.months + 1.day).ago).limit(10_000).pluck(:id))
   end
 end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2fac3e34dc53fc3968c255dbfdafda31921eeec2..195108b921b749f8a85bc733450f0992153ce0b6 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -300,7 +300,7 @@ Settings.cron_jobs['remove_expired_group_links_worker'] ||= Settingslogic.new({}
 Settings.cron_jobs['remove_expired_group_links_worker']['cron'] ||= '10 0 * * *'
 Settings.cron_jobs['remove_expired_group_links_worker']['job_class'] = 'RemoveExpiredGroupLinksWorker'
 Settings.cron_jobs['prune_old_events_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '0 0 * * *'
+Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '* */6 * * *'
 Settings.cron_jobs['prune_old_events_worker']['job_class'] = 'PruneOldEventsWorker'
 
 #