diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageManager.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageManager.java
index f461c7a..6f47553 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageManager.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageManager.java
@@ -60,7 +60,7 @@ public class StorageManager {
 		
 		ResponseBuilder response = Response
 				.ok(so)
-				.header("content-disposition","attachment; filename = "+fileName)
+				.header("content-disposition","attachment; filename = \""+fileName+"\"")
 				.header("Content-Length", size);
 		if (contentType!= null) response.header("Content-Type",contentType);
 		return response.build();