diff --git a/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeSenderPage.razor b/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeSenderPage.razor
index b2f8ad44..3f9017a6 100644
--- a/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeSenderPage.razor
+++ b/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeSenderPage.razor
@@ -352,7 +352,7 @@
 
         try
         {
-            _allEnvelopes = await EnvelopeService.GetAsync();
+            _allEnvelopes = await EnvelopeService.GetAsync() ?? [];
             
             // Split into active and completed based on status
             var envelopes = _allEnvelopes.ToList();