diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
index 243dbdf0f..b2e9c4904 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
@@ -52,6 +52,11 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
             if (@event.Payload is SchemaEvent schemaEvent)
             {
+                if (schemaEvent.SchemaId == null)
+                {
+                    return Task.FromResult<HistoryEvent?>(null);
+                }
+
                 result = result.Param("Schema", schemaEvent.SchemaId.Name);
             }