diff --git a/changelog/unreleased/lower-tus-chunk-size.md b/changelog/unreleased/lower-tus-chunk-size.md
new file mode 100644
index 00000000000..bbd28c55038
--- /dev/null
+++ b/changelog/unreleased/lower-tus-chunk-size.md
@@ -0,0 +1,6 @@
+Enhancement: Lower TUS max chunk size
+
+We've lowered the TUS max chunk size from infinite to 0.1GB so that chunking actually happens.
+
+https://github.com/owncloud/ocis/pull/2584
+https://github.com/cs3org/reva/pull/2136
diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go
index faa944b123d..1f1a3a57bfb 100644
--- a/storage/pkg/flagset/frontend.go
+++ b/storage/pkg/flagset/frontend.go
@@ -191,7 +191,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.IntFlag{
 			Name:        "upload-max-chunk-size",
-			Value:       flags.OverrideDefaultInt(cfg.Reva.UploadMaxChunkSize, 0),
+			Value:       flags.OverrideDefaultInt(cfg.Reva.UploadMaxChunkSize, 1e+8), // 0.1 GB
 			Usage:       "Max chunk size in bytes to advertise to clients through capabilities, or 0 for unlimited",
 			EnvVars:     []string{"STORAGE_FRONTEND_UPLOAD_MAX_CHUNK_SIZE"},
 			Destination: &cfg.Reva.UploadMaxChunkSize,