diff --git a/DysonNetwork.Sphere/Storage/FileController.cs b/DysonNetwork.Sphere/Storage/FileController.cs
index 6b45ebc..5b3784d 100644
--- a/DysonNetwork.Sphere/Storage/FileController.cs
+++ b/DysonNetwork.Sphere/Storage/FileController.cs
@@ -31,7 +31,7 @@ public class FileController(
         }
 
         var dest = fs.GetRemoteStorageConfig(file.UploadedTo);
-        var fileName = file.StorageId;
+        var fileName = string.IsNullOrWhiteSpace(file.StorageId) ? file.Id : file.StorageId;
 
         if (!original && file.HasCompression)
         {
@@ -65,7 +65,7 @@ public class FileController(
             var openUrl = await client.PresignedGetObjectAsync(
                 new PresignedGetObjectArgs()
                     .WithBucket(bucket)
-                    .WithObject(file.Id)
+                    .WithObject(fileName)
                     .WithExpiry(3600)
             );