diff --git a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs b/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
index bfd696698..1428d3db4 100644
--- a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
+++ b/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
@@ -275,11 +275,11 @@ public class DatabaseMessageStore(ILogger<DatabaseMessageStore> logger, Config c
 
         if (attachment is MimePart mimePartAttachment)
         {
-            mimePartAttachment.Content.DecodeTo(memory);
+            mimePartAttachment.Content?.DecodeTo(memory);
         }
         else
         {
-            ((MessagePart)attachment).Message.WriteTo(memory);
+            ((MessagePart)attachment).Message?.WriteTo(memory);
         }
 
         return memory.ToArray();