diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs
index 4cc1b47c5..800a41687 100644
--- a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs
+++ b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs
@@ -59,7 +59,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State
                 SchemaDef = SchemaDef.AddField(field);
             }
 
-            SchemaFieldsTotal++;
+            SchemaFieldsTotal = Math.Max(SchemaFieldsTotal, @event.FieldId.Id);
         }
 
         protected void On(SchemaCategoryChanged @event)