diff --git a/EnvelopeGenerator.API/Controllers/DocumentController.cs b/EnvelopeGenerator.API/Controllers/DocumentController.cs
index 39e503d7..dc55d7de 100644
--- a/EnvelopeGenerator.API/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.API/Controllers/DocumentController.cs
@@ -19,33 +19,39 @@ namespace EnvelopeGenerator.API.Controllers;
 public class DocumentController(IMediator mediator, ILogger<DocumentController> logger) : ControllerBase
 {
     /// <summary>
-    /// Returns the document bytes for the specified envelope receiver key.
+    /// Returns the document bytes receiver.
     /// </summary>
     /// <param name="query">Encoded envelope key.</param>
     /// <param name="cancel">Cancellation token.</param>
     [HttpGet]
-    [Authorize(Roles = Role.Sender)]
-    public async Task<IActionResult> GetDocument(ReadDocumentQuery query, CancellationToken cancel)
+    [Authorize(Roles = $"{Role.Sender},{Role.Receiver.FullyAuth}")]
+    public async Task<IActionResult> GetDocument(CancellationToken cancel, [FromQuery] ReadDocumentQuery? query = null)
     {
-        var doc = await mediator.Send(query, cancel);
-        return doc.ByteData is byte[] docByte
-            ? File(docByte, "application/octet-stream")
-            : NotFound("Document is empty.");
-    }
+        // Sender: expects query with envelope key
+        if (User.IsInRole(Role.Sender))
+        {
+            if (query is null)
+                return BadRequest("Missing document query.");
 
-    /// <summary>
-    /// Returns the document bytes for the receiver.
-    /// </summary>
-    /// <param name="cancel">Cancellation token.</param>
-    [HttpGet]
-    [Authorize(Roles = Role.Receiver.FullyAuth)]
-    public async Task<IActionResult> GetDocument(CancellationToken cancel)
-    {
-        var envelopeId = User.GetEnvelopeIdOfReceiver();
+            var senderDoc = await mediator.Send(query, cancel);
+            return senderDoc.ByteData is byte[] senderDocByte
+                ? File(senderDocByte, "application/octet-stream")
+                : NotFound("Document is empty.");
+        }
 
-        var doc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
-        return doc.ByteData is byte[] docByte
-            ? File(docByte, "application/octet-stream")
-            : NotFound("Document is empty.");
+        // Receiver: resolve envelope id from claims
+        if (User.IsInRole(Role.Receiver.FullyAuth))
+        {           
+            if (query is not null)
+                return BadRequest("Query parameters are not allowed for receiver role.");
+
+            var envelopeId = User.GetEnvelopeIdOfReceiver();
+            var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
+            return receiverDoc.ByteData is byte[] receiverDocByte
+                ? File(receiverDocByte, "application/octet-stream")
+                : NotFound("Document is empty.");
+        }
+
+        return Unauthorized();
     }
 }
\ No newline at end of file