diff --git a/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs b/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs
index a020d425a..c0374102a 100644
--- a/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs
+++ b/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs
@@ -28,7 +28,7 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                 var lists = await _directory.GetListsAsync(cancellationToken);
                 foreach (var list in lists)
                 {
-                    _mediator.EnqueueBackgroundJob(new ArchiveList.Command(list.Id));
+                    new ArchiveList.Command(list.Id).EnqueueBackgroundJob();
                 }
 
                 return Unit.Value;
diff --git a/services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs
index cebda2456..d4dfeaeb5 100644
--- a/services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs
+++ b/services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs
@@ -33,9 +33,7 @@ public static void UseApplication(this IApplicationBuilder app)
         private static void ScheduleArchival(this IApplicationBuilder app)
         {
             _ = app ?? throw new ArgumentNullException(nameof(app));
-
-            var mediator = (IMediator)app.ApplicationServices.GetService(typeof(IMediator));
-            mediator.AddOrUpdateRecurringJob(new EnqueueArchiveAllLists.Command(), Cron.Daily);
+            new EnqueueArchiveAllLists.Command().AddOrUpdateRecurringJob(Cron.Daily);
         }
     }
 }
diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ScheduleMediator.cs b/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ScheduleMediator.cs
index 60e7deb78..720dbe6d3 100644
--- a/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ScheduleMediator.cs
+++ b/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ScheduleMediator.cs
@@ -6,17 +6,14 @@
 namespace FilterLists.Archival.Infrastructure.Scheduling
 {
     /// <remarks>https://codeopinion.com/background-commands-mediatr-hangfire/</remarks>
-    public static class MediatorExtensions
+    public static class RequestExtensions
     {
-        public static void EnqueueBackgroundJob(this IMediator _, IRequest request)
+        public static void EnqueueBackgroundJob(this IRequest request)
         {
             BackgroundJob.Enqueue<HangfireMediator>(m => m.Send(request));
         }
 
-        public static void AddOrUpdateRecurringJob(
-            this IMediator _,
-            IRequest request,
-            Func<string> cronExpression)
+        public static void AddOrUpdateRecurringJob(this IRequest request, Func<string> cronExpression)
         {
             RecurringJob.AddOrUpdate<HangfireMediator>(m => m.Send(request), cronExpression);
         }