diff --git a/src/SIL.Harmony.Core/CommitBase.cs b/src/SIL.Harmony.Core/CommitBase.cs
index 8ea08fe..c29deb9 100644
--- a/src/SIL.Harmony.Core/CommitBase.cs
+++ b/src/SIL.Harmony.Core/CommitBase.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Hashing;
 using System.Text.Json.Serialization;
 
@@ -12,7 +11,6 @@ public abstract class CommitBase : IComparable<CommitBase>
 {
     public const string NullParentHash = "0000";
     [JsonConstructor]
-    [SetsRequiredMembers]
     protected internal CommitBase(Guid id, HybridDateTime hybridDateTime)
     {
         Id = id;
@@ -71,7 +69,6 @@ public int CompareTo(CommitBase? other)
 /// <inheritdoc cref="CommitBase"/>
 public abstract class CommitBase<TChange> : CommitBase
 {
-    [SetsRequiredMembers]
     internal CommitBase(Guid id, HybridDateTime hybridDateTime) : base(id, hybridDateTime)
     {
     }
diff --git a/src/SIL.Harmony.Core/ServerCommit.cs b/src/SIL.Harmony.Core/ServerCommit.cs
index 5c9fc2e..b87a5c0 100644
--- a/src/SIL.Harmony.Core/ServerCommit.cs
+++ b/src/SIL.Harmony.Core/ServerCommit.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -8,7 +7,6 @@ namespace SIL.Harmony.Core;
 public class ServerCommit : CommitBase<ServerJsonChange>
 {
     [JsonConstructor]
-    [SetsRequiredMembers]
     protected ServerCommit(Guid id, HybridDateTime hybridDateTime) : base(id,
         hybridDateTime)
     {
diff --git a/src/SIL.Harmony.Tests/Core/ServerCommitTests.cs b/src/SIL.Harmony.Tests/Core/ServerCommitTests.cs
new file mode 100644
index 0000000..eab7411
--- /dev/null
+++ b/src/SIL.Harmony.Tests/Core/ServerCommitTests.cs
@@ -0,0 +1,51 @@
+using System.Text.Json;
+using SIL.Harmony.Core;
+
+namespace SIL.Harmony.Tests.Core;
+
+public class ServerCommitTests
+{
+    // ASP.NET Core's defaults, which sync servers use to read uploaded commits
+    private static readonly JsonSerializerOptions WebOptions = new(JsonSerializerDefaults.Web);
+
+    private const string ValidJson = """
+        {
+          "id": "11111111-1111-1111-1111-111111111111",
+          "clientId": "22222222-2222-2222-2222-222222222222",
+          "hybridDateTime": { "dateTime": "2026-01-01T00:00:00+00:00", "counter": 3 },
+          "changeEntities": [
+            {
+              "index": 0,
+              "commitId": "11111111-1111-1111-1111-111111111111",
+              "entityId": "33333333-3333-3333-3333-333333333333",
+              "change": { "$type": "SomeChange", "text": "hello" }
+            }
+          ]
+        }
+        """;
+
+    [Fact]
+    public void CanRoundTripThroughJson()
+    {
+        var commit = JsonSerializer.Deserialize<ServerCommit>(ValidJson, WebOptions)!;
+        commit.ClientId.Should().Be(Guid.Parse("22222222-2222-2222-2222-222222222222"));
+        commit.HybridDateTime.Counter.Should().Be(3);
+
+        var json = JsonSerializer.Serialize(commit, WebOptions);
+        var roundTripped = JsonSerializer.Deserialize<ServerCommit>(json, WebOptions);
+        JsonSerializer.Serialize(roundTripped, WebOptions).Should().Be(json);
+    }
+
+    [Theory]
+    [InlineData("clientId")]
+    [InlineData("hybridDateTime")]
+    public void RejectsMissingRequiredProperty(string property)
+    {
+        var json = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(ValidJson)!;
+        json.Remove(property);
+
+        var act = () => JsonSerializer.Deserialize<ServerCommit>(JsonSerializer.Serialize(json), WebOptions);
+
+        act.Should().Throw<JsonException>().WithMessage($"*{property}*");
+    }
+}
diff --git a/src/SIL.Harmony/Commit.cs b/src/SIL.Harmony/Commit.cs
index 715648c..ce54a0a 100644
--- a/src/SIL.Harmony/Commit.cs
+++ b/src/SIL.Harmony/Commit.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using SIL.Harmony.Changes;
 using SIL.Harmony.Db;
@@ -8,7 +7,6 @@ namespace SIL.Harmony;
 public class Commit : CommitBase<IChange>
 {
     [JsonConstructor]
-    [SetsRequiredMembers]
     protected Commit(Guid id, string hash, string parentHash, HybridDateTime hybridDateTime) : base(id,
         hybridDateTime)
     {