diff --git a/pkg/cc/clients/options.go b/pkg/cc/clients/options.go
index fc553c7..cace158 100644
--- a/pkg/cc/clients/options.go
+++ b/pkg/cc/clients/options.go
@@ -116,6 +116,10 @@ func (c *optionsBuilder) tenantOption() (client.ConnectionOption, error) {
 		return client.WithTenantID(c.tenantID), nil
 	}
 
+	if c.token.TenantID() != "" {
+		return client.WithTenantID(c.token.TenantID()), nil
+	}
+
 	if !c.isHosted() {
 		return nilOption, nil
 	}