diff --git a/pkg/storage/unified/resource/client_wrapper.go b/pkg/storage/unified/resource/client_wrapper.go
index 6bdf13768a1..788b384900d 100644
--- a/pkg/storage/unified/resource/client_wrapper.go
+++ b/pkg/storage/unified/resource/client_wrapper.go
@@ -86,7 +86,7 @@ func NewResourceStoreClientCloud(conn *grpc.ClientConn, cfg *setting.Cfg) (Resou
 
 	opts := []authnlib.GrpcClientInterceptorOption{
 		authnlib.WithIDTokenExtractorOption(idTokenExtractor),
-		authnlib.WithMetadataExtractorOption(orgIdExtractor),
+		authnlib.WithMetadataExtractorOption(stackIdExtractor(cfg.StackID)),
 	}
 
 	if cfg.Env == setting.Dev {
@@ -137,3 +137,9 @@ func orgIdExtractor(ctx context.Context) (key string, values []string, err error
 
 	return authzlib.DefaultStackIDMetadataKey, []string{fmt.Sprintf("%d", requester.GetOrgID())}, nil
 }
+
+func stackIdExtractor(stackID string) func(ctx context.Context) (key string, values []string, err error) {
+	return func(ctx context.Context) (key string, values []string, err error) {
+		return authzlib.DefaultStackIDMetadataKey, []string{stackID}, nil
+	}
+}