diff --git a/Runtime/Scripts/DataStream.cs b/Runtime/Scripts/DataStream.cs
index 7d18b8de..57368ca0 100644
--- a/Runtime/Scripts/DataStream.cs
+++ b/Runtime/Scripts/DataStream.cs
@@ -393,8 +393,8 @@ public WriteToFileInstruction WriteToFile(string directory = null, string nameOv
             using var request = FFIBridge.Instance.NewRequest<ByteStreamReaderWriteToFileRequest>();
             var writeToFileReq = request.request;
             writeToFileReq.ReaderHandle = (ulong)_handle.DangerousGetHandle();
-            writeToFileReq.Directory = directory;
-            writeToFileReq.NameOverride = nameOverride;
+            if (directory != null) writeToFileReq.Directory = directory;
+            if (nameOverride != null) writeToFileReq.NameOverride = nameOverride;
 
             var instruction = new WriteToFileInstruction(request.RequestAsyncId);
             using var response = request.Send();