diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs
index 9e0da6be6..1af611588 100644
--- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs
@@ -97,7 +97,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules
 
         public async Task EnqueueAsync(RuleJob job, Instant? nextAttempt, CancellationToken ct = default)
         {
-            var entity = SimpleMapper.Map(job, new MongoRuleEventEntity { Job = job, Created = job.Created, NextAttempt = nextAttempt });
+            var entity = new MongoRuleEventEntity { Job = job, Created = job.Created, NextAttempt = nextAttempt };
+
+            SimpleMapper.Map(job, entity);
+
+            entity.DocumentId = job.Id.ToString();
 
             await Collection.InsertOneIfNotExistsAsync(entity, ct);
         }
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs
index 1f771b498..5fd165401 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs
@@ -141,16 +141,6 @@ namespace Squidex.Domain.Apps.Entities.Comments
             return new CommandContext(command, commandBus);
         }
 
-        private static bool IsForUser(ICommand command, string id)
-        {
-            return command is CreateComment createComment &&
-                createComment.CommentsId == id &&
-                createComment.Mentions == null &&
-                createComment.AppId == null &&
-                createComment.ExpectedVersion == EtagVersion.Any &&
-                createComment.IsMention;
-        }
-
         private void SetupUser(string id, string email)
         {
             var user = A.Fake<IUser>();
diff --git a/frontend/app/features/content/pages/comments/comments-page.component.scss b/frontend/app/features/content/pages/comments/comments-page.component.scss
index e69de29bb..6bb9a8b0e 100644
--- a/frontend/app/features/content/pages/comments/comments-page.component.scss
+++ b/frontend/app/features/content/pages/comments/comments-page.component.scss
@@ -0,0 +1,6 @@
+sqx-comments {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    height: 100%;
+}
\ No newline at end of file