diff --git a/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/IOutboxSender.cs b/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/IOutboxSender.cs
index efc278844a..b9a78060df 100644
--- a/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/IOutboxSender.cs
+++ b/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/IOutboxSender.cs
@@ -1,3 +1,4 @@
+using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.EventBus.Distributed;
 
@@ -5,7 +6,7 @@ namespace Volo.Abp.EventBus.Boxes
 {
     public interface IOutboxSender
     {
-        Task StartAsync(OutboxConfig outboxConfig);
-        Task StopAsync();
+        Task StartAsync(OutboxConfig outboxConfig, CancellationToken cancellationToken = default);
+        Task StopAsync(CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/OutboxSender.cs b/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/OutboxSender.cs
index 176f281caa..94d0175e10 100644
--- a/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/OutboxSender.cs
+++ b/framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/OutboxSender.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Medallion.Threading;
 using Microsoft.Extensions.DependencyInjection;
@@ -37,17 +38,17 @@ namespace Volo.Abp.EventBus.Boxes
             Logger = NullLogger<OutboxSender>.Instance;
         }
 
-        public virtual Task StartAsync(OutboxConfig outboxConfig)
+        public virtual Task StartAsync(OutboxConfig outboxConfig, CancellationToken cancellationToken = default)
         {
             OutboxConfig = outboxConfig;
             Outbox = (IEventOutbox)ServiceProvider.GetRequiredService(outboxConfig.ImplementationType);
-            Timer.Start();
+            Timer.Start(cancellationToken);
             return Task.CompletedTask;
         }
 
-        public virtual Task StopAsync()
+        public virtual Task StopAsync(CancellationToken cancellationToken = default)
         {
-            Timer.Stop();
+            Timer.Stop(cancellationToken);
             return Task.CompletedTask;
         }
         
@@ -85,12 +86,11 @@ namespace Volo.Abp.EventBus.Boxes
                             Logger.LogInformation($"Sent the event to the message broker with id = {waitingEvent.Id:N}");
                         }
                     }
-
-                    await Task.Delay(30000);
                 }
                 else
                 {
                     Logger.LogDebug("Could not obtain the distributed lock: " + DistributedLockName);
+                    await Task.Delay(7000); //TODO: Can we pass a cancellation token to cancel on shutdown? (Config?)
                 }
             }
         }