diff --git a/Pf2eModel/Pf2eDbContextModel.cs b/Pf2eModel/Pf2eDbContextModel.cs
index 99e5fb6..56a8917 100644
--- a/Pf2eModel/Pf2eDbContextModel.cs
+++ b/Pf2eModel/Pf2eDbContextModel.cs
@@ -76,7 +76,10 @@ public partial class Pf2eDbContext
     {
         entity
             .Property(func)
-            .HasConversion(v => v.Serialize(), v => LocaleString.Deserialize(v))
+            .HasConversion(
+                v => v == null ? null : v.Serialize(),
+                v => v == null ? null : LocaleString.Deserialize(v)
+            )
             .HasColumnType("jsonb")
             .IsRequired(required);
     }