diff --git a/src/components/pages/Manage/index.tsx b/src/components/pages/Manage/index.tsx
index 5e4eb979..a7f3be32 100644
--- a/src/components/pages/Manage/index.tsx
+++ b/src/components/pages/Manage/index.tsx
@@ -1,4 +1,5 @@
 import {
+  Anchor,
   Box,
   Button,
   Card,
@@ -383,7 +384,11 @@ export default function Manage() {
             rows={
               exports
                 ? exports.map((x, i) => ({
-                    name: <Link href={'/api/user/export?name=' + x.full}>Export {i + 1}</Link>,
+                    name: (
+                      <Anchor target='_blank' href={'/api/user/export?name=' + x.full}>
+                        Export {i + 1}
+                      </Anchor>
+                    ),
                     date: x.date.toLocaleString(),
                     size: bytesToRead(x.size),
                   }))
diff --git a/src/lib/datasources/S3.ts b/src/lib/datasources/S3.ts
index 95f37ef0..32a937cb 100644
--- a/src/lib/datasources/S3.ts
+++ b/src/lib/datasources/S3.ts
@@ -14,12 +14,9 @@ export class S3 extends Datasource {
       accessKey: config.access_key_id,
       secretKey: config.secret_access_key,
       pathStyle: config.force_s3_path,
-      port: 9000,
       useSSL: config.use_ssl,
       region: config.region,
     });
-
-    // this.s3.
   }
 
   public async save(file: string, data: Buffer): Promise<void> {
diff --git a/src/pages/api/user/export.ts b/src/pages/api/user/export.ts
index 336d41d8..7943aba3 100644
--- a/src/pages/api/user/export.ts
+++ b/src/pages/api/user/export.ts
@@ -87,7 +87,8 @@ async function handler(req: NextApiReq, res: NextApiRes) {
     Logger.get('user').info(`Export for ${user.username} (${user.id}) has started`);
     for (let i = 0; i !== files.length; ++i) {
       const file = files[i];
-      const stream = datasource.get(file.file);
+      // try {
+      const stream = await datasource.get(file.file);
       if (stream) {
         const def = new ZipPassThrough(file.file);
         zip.add(def);
@@ -101,6 +102,9 @@ async function handler(req: NextApiReq, res: NextApiRes) {
         stream.on('data', (c) => def.push(c));
         stream.on('end', () => def.push(new Uint8Array(0), true));
       }
+      // } catch (e) {
+
+      // }
     }
 
     zip.end();