diff --git a/app/controllers/TracksController.php b/app/controllers/TracksController.php
index d1c1d661..b0c204c2 100644
--- a/app/controllers/TracksController.php
+++ b/app/controllers/TracksController.php
@@ -138,7 +138,7 @@
 				$response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"');
 			} else {
 				$response->header('X-Accel-Redirect', $filename);
-				$response->header('Content-Disposition', 'attachment; filename=' . $track->getDownloadFilenameFor($formatName));
+				$response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"');
 			}
 
 			$time = gmdate(filemtime($filename));