diff --git a/internal/api/album.go b/internal/api/album.go
index b9638012c..cb7b2c1dc 100644
--- a/internal/api/album.go
+++ b/internal/api/album.go
@@ -4,8 +4,6 @@ import (
 	"archive/zip"
 	"fmt"
 	"net/http"
-	"os"
-	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -425,7 +423,6 @@ func DownloadAlbum(router *gin.RouterGroup) {
 		}
 
 		start := time.Now()
-		conf := service.Config()
 		a, err := query.AlbumByUID(c.Param("uid"))
 
 		if err != nil {
@@ -440,28 +437,12 @@ func DownloadAlbum(router *gin.RouterGroup) {
 			return
 		}
 
-		zipPath := path.Join(conf.TempPath(), "album")
 		zipToken := rnd.Token(3)
-		zipBaseName := fmt.Sprintf("%s-%s.zip", strings.Title(a.AlbumSlug), zipToken)
-		zipFileName := path.Join(zipPath, zipBaseName)
+		zipFileName := fmt.Sprintf("%s-%s.zip", strings.Title(a.AlbumSlug), zipToken)
 
-		if err := os.MkdirAll(zipPath, 0700); err != nil {
-			log.Error(err)
-			Abort(c, http.StatusInternalServerError, i18n.ErrCreateFolder)
-			return
-		}
+		c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", zipFileName))
 
-		newZipFile, err := os.Create(zipFileName)
-
-		if err != nil {
-			log.Error(err)
-			Abort(c, http.StatusInternalServerError, i18n.ErrCreateFile)
-			return
-		}
-
-		defer newZipFile.Close()
-
-		zipWriter := zip.NewWriter(newZipFile)
+		zipWriter := zip.NewWriter(c.Writer)
 		defer func() { _ = zipWriter.Close() }()
 
 		for _, f := range p {
@@ -481,22 +462,7 @@ func DownloadAlbum(router *gin.RouterGroup) {
 			}
 		}
 
-		log.Infof("album: archive %s created in %s", txt.Quote(zipBaseName), time.Since(start))
+		log.Infof("album: archive %s created in %s", txt.Quote(zipFileName), time.Since(start))
 		_ = zipWriter.Close()
-		newZipFile.Close()
-
-		if !fs.FileExists(zipFileName) {
-			log.Errorf("could not find zip file: %s", zipFileName)
-			c.Data(http.StatusNotFound, "image/svg+xml", photoIconSvg)
-			return
-		}
-
-		c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", zipBaseName))
-
-		c.File(zipFileName)
-
-		if err := os.Remove(zipFileName); err != nil {
-			log.Errorf("album: could not remove %s (%s)", txt.Quote(zipFileName), err.Error())
-		}
 	})
 }