diff --git a/src/Squidex.Infrastructure/CQRS/Events/Actors/EventConsumerActor.cs b/src/Squidex.Infrastructure/CQRS/Events/Actors/EventConsumerActor.cs
index 63f5f4e7f..67abb9778 100644
--- a/src/Squidex.Infrastructure/CQRS/Events/Actors/EventConsumerActor.cs
+++ b/src/Squidex.Infrastructure/CQRS/Events/Actors/EventConsumerActor.cs
@@ -195,7 +195,8 @@ namespace Squidex.Infrastructure.CQRS.Events.Actors
 
         private async Task StopAsync(Exception exception = null)
         {
-            await eventSubscription.StopAsync();
+            eventSubscription.StopAsync().Forget();
+
             await eventConsumerInfoRepository.StopAsync(eventConsumer.Name, exception?.ToString());
         }
 
diff --git a/src/Squidex.Infrastructure/ExceptionHelper.cs b/src/Squidex.Infrastructure/ExceptionHelper.cs
index 02b50998d..e40ddc5cd 100644
--- a/src/Squidex.Infrastructure/ExceptionHelper.cs
+++ b/src/Squidex.Infrastructure/ExceptionHelper.cs
@@ -21,7 +21,7 @@ namespace Squidex.Infrastructure
                 return aggregateException.InnerExceptions.Count == 1 && Is<T>(aggregateException.InnerExceptions[0]);
             }
 
-            return ex is OperationCanceledException;
+            return ex is T;
         }
     }
 }