diff --git a/PARR.TemplateMatcherWorker/Worker.cs b/PARR.TemplateMatcherWorker/Worker.cs
index ab60a6fc..2a64ed93 100644
--- a/PARR.TemplateMatcherWorker/Worker.cs
+++ b/PARR.TemplateMatcherWorker/Worker.cs
@@ -19,14 +19,14 @@ namespace PARR.TemplateMatcherWorker
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             await mqTemplateMatcher.StartAsync();
+            await Task.Delay(Timeout.Infinite, stoppingToken);
         }
 
 
-        public override Task StopAsync(CancellationToken cancellationToken)
+        public override async Task StopAsync(CancellationToken cancellationToken)
         {
-            mqTemplateMatcher.StopAsync().Wait();
-
-            return base.StopAsync(cancellationToken);
+            await mqTemplateMatcher.StopAsync();
+            await base.StopAsync(cancellationToken);
         }
     }
 }