diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetUsageTracker_EventHandling.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetUsageTracker_EventHandling.cs
index 1f0603cfe..d66e61526 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetUsageTracker_EventHandling.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetUsageTracker_EventHandling.cs
@@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
 
         public int BatchSize
         {
-            get => 1000;
+            get => 1;
         }
 
         public int BatchDelay
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
index d69a49c5f..d10c16aa2 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
@@ -370,8 +370,10 @@ namespace TestSuite.ApiTests
             // STEP 4: Check tags
             var tags = await _.Assets.WaitForTagsAsync(_.AppName, tag1, TimeSpan.FromMinutes(2));
 
-            Assert.Equal(1, tags?[tag1]);
-            Assert.Equal(1, tags?[tag2]);
+            Assert.Contains(tag1, tags);
+            Assert.Contains(tag2, tags);
+            Assert.Equal(1, tags[tag1]);
+            Assert.Equal(1, tags[tag2]);
         }
 
         [Fact]