diff --git a/src/Machine/src/Serval.Machine.Shared/Services/MessageOutboxService.cs b/src/Machine/src/Serval.Machine.Shared/Services/MessageOutboxService.cs
index bcde1e98..01ade34c 100644
--- a/src/Machine/src/Serval.Machine.Shared/Services/MessageOutboxService.cs
+++ b/src/Machine/src/Serval.Machine.Shared/Services/MessageOutboxService.cs
@@ -50,7 +50,6 @@ await _outboxes.UpdateAsync(
                 Content = serializedContent,
                 HasContentStream = false
             };
-        string filePath = Path.Combine(_options.CurrentValue.OutboxDir, outboxMessage.Id);
         await _messages.InsertAsync(outboxMessage, cancellationToken: cancellationToken);
         return outboxMessage.Id;
     }
@@ -85,8 +84,10 @@ await _outboxes.UpdateAsync(
         string filePath = Path.Combine(_options.CurrentValue.OutboxDir, outboxMessage.Id);
         try
         {
-            await using Stream fileStream = _fileSystem.OpenWrite(filePath);
-            await contentStream.CopyToAsync(fileStream, cancellationToken);
+            await using (Stream fileStream = _fileSystem.OpenWrite(filePath))
+            {
+                await contentStream.CopyToAsync(fileStream, cancellationToken);
+            }
             await _messages.InsertAsync(outboxMessage, cancellationToken: cancellationToken);
             return outboxMessage.Id;
         }