diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs
index b1791dc0..188228d9 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs
@@ -37,7 +37,7 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
             return BadRequest("Missing document query.");
 
         var senderDoc = await mediator.Send(query, cancel);
-        return senderDoc.ByteData is byte[] senderDocByte
+        return senderDoc?.ByteData is byte[] senderDocByte
             ? File(senderDocByte, "application/octet-stream")
             : NotFound("Document is empty.");
     }