diff --git a/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs b/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs
index c2120c669..67cdf0548 100644
--- a/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs
+++ b/backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs
@@ -50,7 +50,7 @@ public async Task InitializeAsync()
         if (Path.Exists(projectsFolder)) Directory.Delete(projectsFolder, true);
         Directory.CreateDirectory(projectsFolder);
         _services.ServiceProvider.GetRequiredService<IProjectLoader>()
-            .NewProject(new FwDataProject(_projectName, projectsFolder), "en", "fr");
+            .NewProject(new FwDataProject(_projectName, projectsFolder), "en", "en");
         FwDataApi = _services.ServiceProvider.GetRequiredService<FwDataFactory>().GetFwDataMiniLcmApi(_projectName, false);
 
         var crdtProjectsFolder =
diff --git a/backend/FwLite/LcmCrdt.Tests/JsonPatchEntryRewriteTests.cs b/backend/FwLite/LcmCrdt.Tests/JsonPatchEntryRewriteTests.cs
index b2370c85e..13eb26933 100644
--- a/backend/FwLite/LcmCrdt.Tests/JsonPatchEntryRewriteTests.cs
+++ b/backend/FwLite/LcmCrdt.Tests/JsonPatchEntryRewriteTests.cs
@@ -20,7 +20,6 @@ public void ChangesFromJsonPatch_AddComponentMakesAddEntryComponentChange()
             changes.Should().ContainSingle().Which.Should().BeOfType<AddEntryComponentChange>().Subject;
         addEntryComponentChange.ComplexFormEntryId.Should().Be(_entry.Id);
         addEntryComponentChange.ComponentEntryId.Should().Be(componentEntry.Id);
-        addEntryComponentChange.ComponentHeadword.Should().Be(componentEntry.Headword());
     }
 
     [Fact]
@@ -84,7 +83,6 @@ public void ChangesFromJsonPatch_AddComplexFormMakesAddEntryComponentChange()
             changes.Should().ContainSingle().Which.Should().BeOfType<AddEntryComponentChange>().Subject;
         addEntryComponentChange.ComplexFormEntryId.Should().Be(_entry.Id);
         addEntryComponentChange.ComponentEntryId.Should().Be(componentEntry.Id);
-        addEntryComponentChange.ComponentHeadword.Should().Be(componentEntry.Headword());
     }
 
     [Fact]
diff --git a/backend/FwLite/LcmCrdt/Changes/Entries/AddEntryComponentChange.cs b/backend/FwLite/LcmCrdt/Changes/Entries/AddEntryComponentChange.cs
index a51313198..f93630058 100644
--- a/backend/FwLite/LcmCrdt/Changes/Entries/AddEntryComponentChange.cs
+++ b/backend/FwLite/LcmCrdt/Changes/Entries/AddEntryComponentChange.cs
@@ -10,10 +10,8 @@ namespace LcmCrdt.Changes.Entries;
 public class AddEntryComponentChange : CreateChange<ComplexFormComponent>, ISelfNamedType<AddEntryComponentChange>
 {
     public Guid ComplexFormEntryId { get; }
-    public string? ComplexFormHeadword { get; }
     public Guid ComponentEntryId { get; }
     public Guid? ComponentSenseId { get; }
-    public string? ComponentHeadword { get; }
 
     [JsonConstructor]
     public AddEntryComponentChange(Guid entityId,
@@ -24,9 +22,7 @@ public AddEntryComponentChange(Guid entityId,
         Guid? componentSenseId = null) : base(entityId)
     {
         ComplexFormEntryId = complexFormEntryId;
-        ComplexFormHeadword = complexFormHeadword;
         ComponentEntryId = componentEntryId;
-        ComponentHeadword = componentHeadword;
         ComponentSenseId = componentSenseId;
     }
 
@@ -41,17 +37,22 @@ public AddEntryComponentChange(Guid entityId,
 
     public override async ValueTask<ComplexFormComponent> NewEntity(Commit commit, ChangeContext context)
     {
+        var complexFormEntry = await context.GetCurrent<Entry>(ComplexFormEntryId);
+        var componentEntry = await context.GetCurrent<Entry>(ComponentEntryId);
+        Sense? componentSense = null;
+        if (ComponentSenseId is not null)
+            componentSense = await context.GetCurrent<Sense>(ComponentSenseId.Value);
         return new ComplexFormComponent
         {
             Id = EntityId,
             ComplexFormEntryId = ComplexFormEntryId,
-            ComplexFormHeadword = ComplexFormHeadword,
+            ComplexFormHeadword = complexFormEntry?.Headword(),
             ComponentEntryId = ComponentEntryId,
-            ComponentHeadword = ComponentHeadword,
+            ComponentHeadword = componentEntry?.Headword(),
             ComponentSenseId = ComponentSenseId,
-            DeletedAt = (await context.IsObjectDeleted(ComponentEntryId) ||
-                         await context.IsObjectDeleted(ComplexFormEntryId) ||
-                         ComponentSenseId.HasValue && await context.IsObjectDeleted(ComponentSenseId.Value))
+            DeletedAt = (complexFormEntry?.DeletedAt is not null ||
+                         componentEntry?.DeletedAt is not null ||
+                         (ComponentSenseId.HasValue && componentSense?.DeletedAt is not null))
                 ? commit.DateTime
                 : (DateTime?)null,
         };