diff --git a/main.py b/main.py
index a4766b1..2309bf8 100644
--- a/main.py
+++ b/main.py
@@ -50,7 +50,7 @@ def create_app(test_config=None):
         def remove_file(response):
             os.remove(complete_path)
             return response
-        return send_from_directory(app.config['UPLOAD_FOLDER'], filepath)
+        return send_from_directory(app.config['UPLOAD_FOLDER'], filepath, as_attachment=True)
 
     @app.route('/', methods=['GET', 'POST'])
     def upload_file():
@@ -180,7 +180,7 @@ def create_app(test_config=None):
                     os.remove(complete_path)
                     return response
 
-            return send_from_directory(app.config['UPLOAD_FOLDER'], filepath)
+            return send_from_directory(app.config['UPLOAD_FOLDER'], filepath, as_attachment=True)
 
     class APIBulkDownloadCreator(Resource):
         schema = {
diff --git a/test/test_api.py b/test/test_api.py
index 2029820..de297c4 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -157,6 +157,7 @@ class Mat2APITestCase(unittest.TestCase):
 
         request = self.app.get(data['download_link'])
         self.assertEqual(request.status_code, 200)
+        self.assertIn('attachment; filename=test_name.cleaned.jpg', request.headers['Content-Disposition'])
 
         request = self.app.get(data['download_link'])
         self.assertEqual(request.status_code, 404)
@@ -219,6 +220,7 @@ class Mat2APITestCase(unittest.TestCase):
         self.assertEqual(request.headers['Content-Length'], '1596')
 
         request = self.app.get(response['download_link'])
+        self.assertIn('attachment; filename=files.', request.headers['Content-Disposition'])
         zip_response = zipfile.ZipFile(BytesIO(request.data))
         self.assertEquals(2, len(zip_response.namelist()))
         for name in zip_response.namelist():