diff --git a/frontend/src/download.js b/frontend/src/download.js
index 1d7a9470..2d348cba 100644
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@@ -33,7 +33,6 @@ async function download() {
   window.addEventListener('unload', unloadHandler);
 
   fileReceiver.on('progress', data => {
-    console.log(`${data[0]}/${data[1]}`);
     progress.setProgress({ complete: data[0], total: data[1] });
   });
 
diff --git a/frontend/src/fileReceiver.js b/frontend/src/fileReceiver.js
index 3b9401b2..13caafa5 100644
--- a/frontend/src/fileReceiver.js
+++ b/frontend/src/fileReceiver.js
@@ -38,14 +38,13 @@ export default class FileReceiver extends EventEmitter {
         }
 
         const blob = new Blob([this.response]);
-        const type = xhr.getResponseHeader('Content-Type');
         const meta = JSON.parse(xhr.getResponseHeader('X-File-Metadata'));
         const fileReader = new FileReader();
         fileReader.onload = function() {
           resolve({
             data: this.result,
             name: meta.filename,
-            type,
+            type: meta.mimeType,
             iv: meta.id
           });
         };
diff --git a/server/server.js b/server/server.js
index fc379bef..c3c97a47 100644
--- a/server/server.js
+++ b/server/server.js
@@ -194,7 +194,7 @@ app.get('/assets/download/:id', async (req, res) => {
     const contentLength = await storage.length(id);
     res.writeHead(200, {
       'Content-Disposition': `attachment; filename=${meta.filename}`,
-      'Content-Type': meta.mimeType,
+      'Content-Type': 'application/octet-stream',
       'Content-Length': contentLength,
       'X-File-Metadata': JSON.stringify(meta)
     });