diff --git a/src/ReC.Application/Common/Validations/DeleteObjectProcedureValidator.cs b/src/ReC.Application/Common/Validations/DeleteObjectProcedureValidator.cs
index 9e0aedb..061c02b 100644
--- a/src/ReC.Application/Common/Validations/DeleteObjectProcedureValidator.cs
+++ b/src/ReC.Application/Common/Validations/DeleteObjectProcedureValidator.cs
@@ -7,6 +7,10 @@ public class DeleteObjectProcedureValidator : AbstractValidator<DeleteObjectProc
 {
     public DeleteObjectProcedureValidator()
     {
+        RuleFor(x => x.Entity)
+            .IsInEnum()
+            .WithMessage("ENTITY must be a valid EntityType value.");
+
         RuleFor(x => x.Start)
             .GreaterThan(0)
             .WithMessage("Start GUID/ID must be greater than 0.");
diff --git a/src/ReC.Application/Common/Validations/InsertObjectProcedureValidator.cs b/src/ReC.Application/Common/Validations/InsertObjectProcedureValidator.cs
index ec68b8d..6a5354b 100644
--- a/src/ReC.Application/Common/Validations/InsertObjectProcedureValidator.cs
+++ b/src/ReC.Application/Common/Validations/InsertObjectProcedureValidator.cs
@@ -7,11 +7,9 @@ public class InsertObjectProcedureValidator : AbstractValidator<InsertObjectProc
 {
     public InsertObjectProcedureValidator()
     {
-        // ENTITY must be one of the allowed values
         RuleFor(x => x.Entity)
-            .NotEmpty()
-            .Must(e => e is "ACTION" or "ENDPOINT" or "ENDPOINT_AUTH" or "ENDPOINT_PARAMS" or "PROFILE" or "RESULT")
-            .WithMessage("ENTITY must be one of: ACTION, ENDPOINT, ENDPOINT_AUTH, ENDPOINT_PARAMS, PROFILE, RESULT.");
+            .IsInEnum()
+            .WithMessage("ENTITY must be a valid EntityType value.");
 
         // ACTION validation
         When(x => x.Action != null, () =>
diff --git a/src/ReC.Application/Common/Validations/UpdateObjectProcedureValidator.cs b/src/ReC.Application/Common/Validations/UpdateObjectProcedureValidator.cs
index fd02472..5afe709 100644
--- a/src/ReC.Application/Common/Validations/UpdateObjectProcedureValidator.cs
+++ b/src/ReC.Application/Common/Validations/UpdateObjectProcedureValidator.cs
@@ -7,6 +7,10 @@ public class UpdateObjectProcedureValidator : AbstractValidator<UpdateObjectProc
 {
     public UpdateObjectProcedureValidator()
     {
+        RuleFor(x => x.Entity)
+            .IsInEnum()
+            .WithMessage("ENTITY must be a valid EntityType value.");
+
         RuleFor(x => x.Id)
             .GreaterThan(0)
             .WithMessage("Target GUID/ID must be greater than 0.");