diff --git a/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs b/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
index 479c751..a124b6c 100644
--- a/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
+++ b/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
@@ -15,8 +15,6 @@ public class BodyQueryBehavior<TRecAction>(IRecDbContext dbContext) : IPipelineB
 
         var result = await dbContext.BodyQueryResults.FromSqlRaw(action.BodyQuery).SingleOrDefaultAsync(cancel);
 
-        action.BodyQueryExecuted = true;
-
         action.Body = result?.RawBody;
 
         return await next(cancel);
diff --git a/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs b/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs
index 537747a..966c620 100644
--- a/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs
+++ b/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs
@@ -17,8 +17,6 @@ public class HeaderQueryBehavior<TRecAction>(IRecDbContext dbContext, ILogger<He
 
         var result = await dbContext.HeaderQueryResults.FromSqlRaw(action.HeaderQuery).SingleOrDefaultAsync(cancel);
 
-        action.HeaderQueryExecuted = true;
-
         if (result?.RawHeader is null)
         {
             logger?.LogWarning("Header query did not return a result or returned a null REQUEST_HEADER. Profile ID: {ProfileId}, Action ID: {ActionId}", action.ProfileId, action.ActionId);
diff --git a/src/ReC.Application/Common/Dto/RecActionDto.cs b/src/ReC.Application/Common/Dto/RecActionDto.cs
index b4b9fe8..f636510 100644
--- a/src/ReC.Application/Common/Dto/RecActionDto.cs
+++ b/src/ReC.Application/Common/Dto/RecActionDto.cs
@@ -54,20 +54,12 @@ public record RecActionDto
 
     public string? HeaderQuery { get; init; }
 
-    public bool HeaderQueryExecuted { get; set; } = false;
-
-    public bool IsHeaderQueryReturnedNoData => HeaderQueryExecuted && HeaderQuery is null;
-
     public Dictionary<string, string>? Headers { get; set; }
 
     public string? BodyQuery { get; init; }
 
     public string? Body { get; set; }
 
-    public bool BodyQueryExecuted { get; set; } = false;
-
-    public bool IsBodyQueryReturnedNoData => BodyQueryExecuted && Body is null;
-
     public string? PostprocessingQuery { get; init; }
 
     public UriBuilder ToEndpointUriBuilder()
diff --git a/src/ReC.Application/RecActions/Commands/InvokeRecActionCommand.cs b/src/ReC.Application/RecActions/Commands/InvokeRecActionCommand.cs
index 50b9099..9a48172 100644
--- a/src/ReC.Application/RecActions/Commands/InvokeRecActionCommand.cs
+++ b/src/ReC.Application/RecActions/Commands/InvokeRecActionCommand.cs
@@ -45,17 +45,6 @@ public class InvokeRecActionCommandHandler(
             using var reqBody = new StringContent(request.Body);
             httpReq.Content = reqBody;
         }
-        else if(request.BodyQuery is not null && !request.IsBodyQueryReturnedNoData)
-        {
-            logger?.LogWarning(
-               "Although BodyQuery returns null, the IsReturnedNoData variable has not been set to TRUE. " +
-               "This indicates that BodyQueryBehavior has not been executed or that the relevant control step has been skipped. " +
-               "The relevant behavior must be verified to ensure that the process does not produce unexpected conditions. " +
-               "ProfileId: {ProfileId}, ActionId: {ActionId}",
-               request.ProfileId,
-               request.ActionId
-            );
-        }
 
         if (request.Headers is not null)
             foreach (var header in request.Headers)