diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
index 1b8b7265050..a014f3c7978 100644
--- a/internal/grpc/services/storageprovider/storageprovider.go
+++ b/internal/grpc/services/storageprovider/storageprovider.go
@@ -291,6 +291,13 @@ func (s *service) InitiateFileUpload(ctx context.Context, req *provider.Initiate
 		}, nil
 	}
 
+	// FIXME these should be part of the CreateContainerRequest object
+	if req.Opaque != nil {
+		if e, ok := req.Opaque.Map["lockid"]; ok && e.Decoder == "plain" {
+			ctx = ctxpkg.ContextSetLockID(ctx, string(e.Value))
+		}
+	}
+
 	metadata := map[string]string{}
 	var uploadLength int64
 	if req.Opaque != nil && req.Opaque.Map != nil {