diff --git a/changelog/unreleased/fix-content-disposition.md b/changelog/unreleased/fix-content-disposition.md
index 58f126a7ac3..da3822ceb15 100644
--- a/changelog/unreleased/fix-content-disposition.md
+++ b/changelog/unreleased/fix-content-disposition.md
@@ -2,4 +2,5 @@ Bugfix: Fix content disposition header for public links files
 
 https://github.com/cs3org/reva/pull/2303
 https://github.com/cs3org/reva/pull/2297
-https://github.com/cs3org/reva/pull/2332
\ No newline at end of file
+https://github.com/cs3org/reva/pull/2332
+https://github.com/cs3org/reva/pull/2346
\ No newline at end of file
diff --git a/internal/http/services/owncloud/ocdav/get.go b/internal/http/services/owncloud/ocdav/get.go
index cefc4da7df9..95a56f4a21c 100644
--- a/internal/http/services/owncloud/ocdav/get.go
+++ b/internal/http/services/owncloud/ocdav/get.go
@@ -124,7 +124,7 @@ func (s *svc) handleGet(ctx context.Context, w http.ResponseWriter, r *http.Requ
 
 	w.Header().Set(HeaderContentType, info.MimeType)
 	w.Header().Set(HeaderContentDisposistion, "attachment; filename*=UTF-8''"+
-		path.Base(r.RequestURI)+"; filename=\""+path.Base(r.RequestURI)+"\"")
+		path.Base(r.URL.Path)+"; filename=\""+path.Base(r.URL.Path)+"\"")
 	w.Header().Set(HeaderETag, info.Etag)
 	w.Header().Set(HeaderOCFileID, wrapResourceID(info.Id))
 	w.Header().Set(HeaderOCETag, info.Etag)