diff --git a/EnvelopeGenerator.API/Controllers/DocumentController.cs b/EnvelopeGenerator.API/Controllers/DocumentController.cs
index 8458ae09..675ee7e1 100644
--- a/EnvelopeGenerator.API/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.API/Controllers/DocumentController.cs
@@ -70,19 +70,17 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
     [HttpGet("{envelopeKey}")]
     public async Task<IActionResult> GetDocumentOfReceiver(string envelopeKey, CancellationToken cancel)
     {
-        var envelopeId = 2071;
+        var envelopeIdStr = User.FindFirst(EnvelopeClaimNames.EnvelopeId)?.Value;
 
-        //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");
 
-        //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.");
-        //}
+            return StatusCode(StatusCodes.Status500InternalServerError, "Inner service error: Invalid envelope claim.");
+        }
 
         var senderDoc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);