diff --git a/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs b/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
index 77ed91c..4dbb232 100644
--- a/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
+++ b/src/ReC.Application/Common/Behaviors/BodyQueryBehavior.cs
@@ -13,7 +13,7 @@ public class BodyQueryBehavior<TRecAction>(IRecDbContext dbContext) : IPipelineB
         if (action.BodyQuery is null)
             return await next(cancel);
 
-        var result = await dbContext.BodyQueryResults.FromSqlRaw(action.BodyQuery).FirstOrDefaultAsync(cancel);
+        var result = await dbContext.BodyQueryResults.FromSqlRaw(action.BodyQuery).SingleOrDefaultAsync(cancel);
         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 8149416..32d5c15 100644
--- a/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs
+++ b/src/ReC.Application/Common/Behaviors/HeaderQueryBehavior.cs
@@ -15,7 +15,7 @@ public class HeaderQueryBehavior<TRecAction>(IRecDbContext dbContext, ILogger<He
         if (action.HeaderQuery is null)
             return await next(cancel);
 
-        var result = await dbContext.HeaderQueryResults.FromSqlRaw(action.HeaderQuery).FirstOrDefaultAsync(cancel);
+        var result = await dbContext.HeaderQueryResults.FromSqlRaw(action.HeaderQuery).SingleOrDefaultAsync(cancel);
 
         if(result?.RawHeader is null)
             return await next(cancel);