diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
index 041d1afc..8255a43c 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -49,13 +49,13 @@ public static class ReceiverAlreadySignedQueryExtensions
 /// </summary>
 public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlreadySignedQuery, bool>
 {
-    private readonly IRepository<EnvelopeReceiver> _repo;
+    private readonly IRepository<History> _repo;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    public ReceiverAlreadySignedQueryHandler(IRepository<EnvelopeReceiver> repo)
+    public ReceiverAlreadySignedQueryHandler(IRepository<History> repo)
     {
         _repo = repo;
     }
@@ -68,10 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
     /// <returns></returns>
     public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
     {
-        return await _repo.Read()
-            .Where(er => er.Envelope!.Uuid == request.Envelope.Uuid)
-            .Where(er => er.Receiver!.Signature == request.Receiver.Signature)
-            .Where(er => er.Envelope!.Histories.Any(hist => hist.Status == EnvelopeStatus.DocumentSigned))
-            .AnyAsync(cancel);
+        return await _repo.Read().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
     }
 }
\ No newline at end of file