diff --git a/changelog/unreleased/fix-error-message-on-400-code-thumbnail.md b/changelog/unreleased/fix-error-message-on-400-code-thumbnail.md
new file mode 100644
index 0000000000..f135c246bd
--- /dev/null
+++ b/changelog/unreleased/fix-error-message-on-400-code-thumbnail.md
@@ -0,0 +1,6 @@
+Bugfix: Fix error message on 400 response for thumbnail requests
+
+Fix the error message when the thumbnail request returns a '400 Bad Request' response.
+
+https://github.com/owncloud/ocis/issues/2064
+https://github.com/owncloud/ocis/pull/6911
diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go
index 3d5f0d03b7..ea6eb2a526 100644
--- a/services/webdav/pkg/service/v0/service.go
+++ b/services/webdav/pkg/service/v0/service.go
@@ -260,7 +260,7 @@ func (g Webdav) SpacesThumbnail(w http.ResponseWriter, r *http.Request) {
 			renderError(w, r, errTooEarly(err.Error()))
 			return
 		case http.StatusBadRequest:
-			renderError(w, r, errBadRequest(err.Error()))
+			renderError(w, r, errBadRequest(e.Detail))
 		default:
 			renderError(w, r, errInternalError(err.Error()))
 		}
@@ -348,7 +348,7 @@ func (g Webdav) Thumbnail(w http.ResponseWriter, r *http.Request) {
 			renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
 			return
 		case http.StatusBadRequest:
-			renderError(w, r, errBadRequest(err.Error()))
+			renderError(w, r, errBadRequest(e.Detail))
 		default:
 			renderError(w, r, errInternalError(err.Error()))
 		}
@@ -389,7 +389,7 @@ func (g Webdav) PublicThumbnail(w http.ResponseWriter, r *http.Request) {
 			renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
 			return
 		case http.StatusBadRequest:
-			renderError(w, r, errBadRequest(err.Error()))
+			renderError(w, r, errBadRequest(e.Detail))
 		default:
 			renderError(w, r, errInternalError(err.Error()))
 		}
@@ -430,7 +430,7 @@ func (g Webdav) PublicThumbnailHead(w http.ResponseWriter, r *http.Request) {
 			renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
 			return
 		case http.StatusBadRequest:
-			renderError(w, r, errBadRequest(err.Error()))
+			renderError(w, r, errBadRequest(e.Detail))
 		default:
 			renderError(w, r, errInternalError(err.Error()))
 		}
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 7436820da0..ea260e3693 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -212,10 +212,6 @@ cannot share a folder with create permission
 
 - [coreApiWebdavPreviews/previews.feature:98](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavPreviews/previews.feature#L98)
 
-#### [different error message detail for previews of folder](https://github.com/owncloud/ocis/issues/2064)
-
-- [coreApiWebdavPreviews/previews.feature:107](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavPreviews/previews.feature#L107)
-
 #### [copying a folder within a public link folder to folder with same name as an already existing file overwrites the parent file](https://github.com/owncloud/ocis/issues/1232)
 
 - [coreApiSharePublicLink2/copyFromPublicLink.feature:66](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L66)