diff --git a/EnvelopeGenerator.API/Controllers/DocumentController.cs b/EnvelopeGenerator.API/Controllers/DocumentController.cs
index 675ee7e1..74049871 100644
--- a/EnvelopeGenerator.API/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.API/Controllers/DocumentController.cs
@@ -62,25 +62,16 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
     }
 
     /// <summary>
-    /// 
+    /// Gets the document for the specified envelope key.
     /// </summary>
     /// <param name="envelopeKey"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
+    [Authorize(Policy = AuthPolicy.Receiver)]
     [HttpGet("{envelopeKey}")]
     public async Task<IActionResult> GetDocumentOfReceiver(string envelopeKey, CancellationToken cancel)
     {
-        var envelopeIdStr = User.FindFirst(EnvelopeClaimNames.EnvelopeId)?.Value;
-
-        if (!int.TryParse(envelopeIdStr, out int envelopeId))
-        {
-            logger.LogError(
-                "Inner service error: Failed to parse Envelope ID from claims. Claim '{ClaimName}' had an invalid or missing value: '{ClaimValue}'.",
-                EnvelopeClaimNames.EnvelopeId,
-                envelopeIdStr ?? "null");
-
-            return StatusCode(StatusCodes.Status500InternalServerError, "Inner service error: Invalid envelope claim.");
-        }
+        int envelopeId = User.GetEnvelopeIdOfReceiver();
 
         var senderDoc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);