diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index 5ce89ca6..76ad56d7 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -35,9 +35,10 @@ public class Envelope
         UseAccessCode = false;
         Documents = Enumerable.Empty<EnvelopeDocument>().ToList();
         History = Enumerable.Empty<EnvelopeHistory>().ToList();
+        Receivers = Enumerable.Empty<EnvelopeReceiver>().ToList();
 #endif
     }
-        
+
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     [Column("GUID")]
@@ -159,9 +160,11 @@ public class Envelope
 
     public List<EnvelopeHistory> History { get; set; }
 
-    // TODO: * Check the Form App and remove the default value
-    [NotMapped]
-    public List<EnvelopeReceiver> Receivers { get; set; } = Enumerable.Empty<EnvelopeReceiver>().ToList();
+    public List<EnvelopeReceiver>
+#if NET
+        ?
+#endif
+        Receivers { get; set; }
 
 //#if NETFRAMEWORK
     /// <summary>