diff --git a/Hcs.Broker/MessageCapturer/FileMessageCapturer.cs b/Hcs.Broker/MessageCapturer/FileMessageCapturer.cs
index 5f52242..2d73192 100644
--- a/Hcs.Broker/MessageCapturer/FileMessageCapturer.cs
+++ b/Hcs.Broker/MessageCapturer/FileMessageCapturer.cs
@@ -30,6 +30,11 @@ namespace Hcs.Broker.MessageCapturer
 
                 if (!string.IsNullOrEmpty(directory))
                 {
+                    if (!Directory.Exists(directory))
+                    {
+                        Directory.CreateDirectory(directory);
+                    }
+
                     fileName = Path.Combine(directory, fileName);
                 }
             }
diff --git a/Hcs.WebApp/Components/Pages/Test/Export.razor b/Hcs.WebApp/Components/Pages/Test/Export.razor
index c02865f..acc49c0 100644
--- a/Hcs.WebApp/Components/Pages/Test/Export.razor
+++ b/Hcs.WebApp/Components/Pages/Test/Export.razor
@@ -55,7 +55,7 @@
             IsPPAK = false,
             Role = OrganizationRole.RSO,
             Logger = logger,
-            MessageCapturer = new FileMessageCapturer(null, logger)
+            MessageCapturer = new FileMessageCapturer("test/export", logger)
         };
 
         client.SetSigningCertificate("0636D2330032B3C38A4A26D765C787C248");