diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
index 710ac21b..465541ab 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
@@ -57,20 +57,20 @@ public record EnvelopeStatusQuery
     /// <summary>
     /// Der minimale Statuswert, der berücksichtigt werden.
     /// </summary>
-    public int? MinStatus { get; init; }
+    public Constants.EnvelopeStatus? MinStatus { get; init; }
 
     /// <summary>
     /// Der maximale Statuswert, der berücksichtigt werden.
     /// </summary>
-    public int? MaxStatus { get; init; }
+    public Constants.EnvelopeStatus? MaxStatus { get; init; }
 
     /// <summary>
     /// Eine Liste von Statuswerten, die einbezogen werden.
     /// </summary>
-    public int[]? Status { get; init; }
+    public Constants.EnvelopeStatus[]? Status { get; init; }
 
     /// <summary>
     /// Eine Liste von Statuswerten, die ignoriert werden werden.
     /// </summary>
-    public int[]? IgnoredStatus { get; init; }
+    public Constants.EnvelopeStatus[]? IgnoredStatus { get; init; }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index 76ad56d7..5dafbec9 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -50,7 +50,7 @@ public class Envelope
 
     [Required]
     [Column("STATUS")]
-    public int Status { get; set; }
+    public Constants.EnvelopeStatus Status { get; set; }
 
     [Required]
     [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]