diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.State.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.State.cs
index 43a79334e..910796a45 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.State.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.State.cs
@@ -39,7 +39,13 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
             [IgnoreDataMember]
             public ContentData Data
             {
-                get => NewVersion?.Data ?? CurrentVersion.Data;
+                get => NewVersion?.Data ?? CurrentData;
+            }
+
+            [IgnoreDataMember]
+            public ContentData CurrentData
+            {
+                get => CurrentVersion.Data;
             }
 
             [IgnoreDataMember]
@@ -71,7 +77,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
 
                     case ContentDraftCreated e:
                         {
-                            var newData = e.MigratedData?.UseSameFields(Data) ?? CurrentVersion.Data;
+                            var newData = e.MigratedData?.UseSameFields(CurrentData) ?? CurrentData;
 
                             NewVersion = new ContentVersion(e.Status, newData);
 
@@ -97,7 +103,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
                             {
                                 if (e.Status == Status.Published)
                                 {
-                                    CurrentVersion = new ContentVersion(e.Status, NewVersion.Data.UseSameFields(Data));
+                                    CurrentVersion = new ContentVersion(e.Status, NewVersion.Data.UseSameFields(CurrentData));
 
                                     NewVersion = null;
                                 }
@@ -136,7 +142,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
                             }
                             else
                             {
-                                CurrentVersion = CurrentVersion.WithData(e.Data.UseSameFields(Data));
+                                CurrentVersion = CurrentVersion.WithData(e.Data.UseSameFields(CurrentData));
                             }
 
                             break;