diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs
index 934ee5387..79b1e14c4 100644
--- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs
+++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs
@@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
         {
             EnsurePropertiesInitialized();
 
-            return fieldProperties.GetOrDefault(propertyName) ?? new PropertyDescriptor(new ObjectInstance(Engine) { Extensible = true }, true, false, true);
+            return fieldProperties.GetOrAdd(propertyName, x => new ContentDataProperty(this, new ContentFieldObject(this, new ContentFieldData(), false)));
         }
 
         public override IEnumerable<KeyValuePair<string, PropertyDescriptor>> GetOwnProperties()
diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs
index 943d41240..4ea31b9ea 100644
--- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs
+++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs
@@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper
                 {
                     if (value == null || !value.IsObject())
                     {
-                        throw new JavaScriptException("Can only assign object to content data.");
+                        throw new JavaScriptException("You can only assign objects to content data.");
                     }
 
                     var obj = value.AsObject();
diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs
index 9c5f3c7ee..592e0765e 100644
--- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs
@@ -32,6 +32,22 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting
             Assert.Equal(expected, result);
         }
 
+        [Fact]
+        public void Should_update_data_when_setting_lazy_field()
+        {
+            var original = new NamedContentData();
+
+            var expected =
+                new NamedContentData()
+                    .AddField("number",
+                        new ContentFieldData()
+                            .AddValue("iv", 1.0));
+
+            var result = ExecuteScript(original, @"data.number.iv = 1");
+
+            Assert.Equal(expected, result);
+        }
+
         [Fact]
         public void Should_update_data_defining_property_for_content()
         {