diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java
index 9d42806..5088800 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java
@@ -38,6 +38,8 @@ public Response retrieveDatasetInFormat(String id, String format) {
         return Response
                 .ok(content)
                 .type(type)
+                .header("Content-Disposition", "attachment; filename=\"" + id + "." + format + "\"")
+                .header("Content-Length", content.length())
                 .build();
     }