diff --git a/changelog/unreleased/fix-shares-provider-filter.md b/changelog/unreleased/fix-shares-provider-filter.md
new file mode 100644
index 00000000000..d60acf888a6
--- /dev/null
+++ b/changelog/unreleased/fix-shares-provider-filter.md
@@ -0,0 +1,5 @@
+Bugfix: fix shares provider filter
+
+The shares storage provider now correctly filters space types
+
+https://github.com/cs3org/reva/pull/2433
diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
index 816f8c4efa8..3a6f7166d35 100644
--- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
+++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -317,14 +317,15 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
 		case provider.ListStorageSpacesRequest_Filter_TYPE_SPACE_TYPE:
 			spaceType := f.GetSpaceType()
 			// do we need to fetch the shares?
-			if spaceType == "mountpoint" || spaceType == "grant" {
-				spaceTypes[spaceType] = exists
-				fetchShares = true
-			}
 			if spaceType == "+mountpoint" || spaceType == "+grant" {
 				appendTypes = append(appendTypes, strings.TrimPrefix(spaceType, "+"))
 				fetchShares = true
+				continue
+			}
+			if spaceType == "mountpoint" || spaceType == "grant" {
+				fetchShares = true
 			}
+			spaceTypes[spaceType] = exists
 		case provider.ListStorageSpacesRequest_Filter_TYPE_ID:
 			spaceid, shareid, err := utils.SplitStorageSpaceID(f.GetId().OpaqueId)
 			if err != nil {