diff --git a/backend/src/Squidex.Domain.Apps.Entities/Comments/CommentTriggerHandler.cs b/backend/src/Squidex.Domain.Apps.Entities/Comments/CommentTriggerHandler.cs
index a72638d6c..679e19609 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Comments/CommentTriggerHandler.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Comments/CommentTriggerHandler.cs
@@ -42,7 +42,7 @@ namespace Squidex.Domain.Apps.Entities.Comments
         {
             var commentCreated = (CommentCreated)@event.Payload;
 
-            if (!(commentCreated.Mentions?.Length >= 0))
+            if (!(commentCreated.Mentions?.Length > 0))
             {
                 yield break;
             }
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs
index 624fa84c4..82b6b21c6 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs
@@ -77,11 +77,12 @@ namespace Squidex.Domain.Apps.Entities.Comments
             var userIds = users.Select(x => x.Id).ToArray();
 
             var @event = new CommentCreated { Mentions = userIds };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
             A.CallTo(() => userResolver.QueryManyAsync(userIds, default))
                 .Returns(users.ToDictionary(x => x.Id));
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), ctx, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, ctx, default).ToListAsync();
 
             Assert.Equal(2, result.Count);
 
@@ -106,8 +107,9 @@ namespace Squidex.Domain.Apps.Entities.Comments
             var userIds = users.Select(x => x.Id).ToArray();
 
             var @event = new CommentCreated { Mentions = userIds };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), ctx, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, ctx, default).ToListAsync();
 
             Assert.Empty(result);
         }
@@ -118,8 +120,9 @@ namespace Squidex.Domain.Apps.Entities.Comments
             var ctx = Context();
 
             var @event = new CommentCreated { Mentions = null };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), ctx, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, ctx, default).ToListAsync();
 
             Assert.Empty(result);
 
@@ -133,8 +136,9 @@ namespace Squidex.Domain.Apps.Entities.Comments
             var ctx = Context();
 
             var @event = new CommentCreated { Mentions = Array.Empty<string>() };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), ctx, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, ctx, default).ToListAsync();
 
             Assert.Empty(result);
 
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/ManualTriggerHandlerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/ManualTriggerHandlerTests.cs
index 64e75c8d4..50f365cfb 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/ManualTriggerHandlerTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/ManualTriggerHandlerTests.cs
@@ -39,8 +39,9 @@ namespace Squidex.Domain.Apps.Entities.Rules
         public async Task Should_create_event_with_name()
         {
             var @event = TestUtils.CreateEvent<RuleManuallyTriggered>();
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), default, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, default, default).ToListAsync();
 
             var enrichedEvent = (EnrichedManualEvent)result.Single();
 
@@ -55,8 +56,9 @@ namespace Squidex.Domain.Apps.Entities.Rules
             var actor = RefToken.User("me");
 
             var @event = new RuleManuallyTriggered { Actor = actor };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), default, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, default, default).ToListAsync();
 
             Assert.Equal(actor, ((EnrichedUserEventBase)result.Single()).Actor);
         }
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/UsageTracking/UsageTriggerHandlerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/UsageTracking/UsageTriggerHandlerTests.cs
index baae0d82e..d49597529 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/UsageTracking/UsageTriggerHandlerTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/UsageTracking/UsageTriggerHandlerTests.cs
@@ -46,8 +46,9 @@ namespace Squidex.Domain.Apps.Entities.Rules.UsageTracking
             var ctx = Context();
 
             var @event = new AppUsageExceeded { CallsCurrent = 80, CallsLimit = 120 };
+            var envelope = Envelope.Create<AppEvent>(@event);
 
-            var result = await sut.CreateEnrichedEventsAsync(Envelope.Create<AppEvent>(@event), ctx, default).ToListAsync();
+            var result = await sut.CreateEnrichedEventsAsync(envelope, ctx, default).ToListAsync();
 
             var enrichedEvent = result.Single() as EnrichedUsageExceededEvent;