diff --git a/cli/internal/helm/client.go b/cli/internal/helm/client.go
index 52e20feef..6deba8ef9 100644
--- a/cli/internal/helm/client.go
+++ b/cli/internal/helm/client.go
@@ -317,7 +317,11 @@ func (c *Client) loadUpgradeValues(ctx context.Context, conf *config.Config, cha
 	switch chart.Metadata.Name {
 	case ciliumInfo.chartName:
 		releaseName = ciliumInfo.releaseName
-		values = ciliumVals[conf.GetProvider().String()]
+		var ok bool
+		values, ok = ciliumVals[conf.GetProvider().String()]
+		if !ok {
+			return "", nil, fmt.Errorf("cilium values for csp %q not found", conf.GetProvider().String())
+		}
 	case certManagerInfo.chartName:
 		releaseName = certManagerInfo.releaseName
 		values = loader.loadCertManagerValues()
diff --git a/cli/internal/helm/loader.go b/cli/internal/helm/loader.go
index 1df4d4aac..a26108ea3 100644
--- a/cli/internal/helm/loader.go
+++ b/cli/internal/helm/loader.go
@@ -155,7 +155,11 @@ func (i *ChartLoader) loadRelease(info chartInfo, helmWaitMode helm.WaitMode) (h
 
 	switch info.releaseName {
 	case ciliumInfo.releaseName:
-		values = ciliumVals[i.csp.String()]
+		var ok bool
+		values, ok = ciliumVals[i.csp.String()]
+		if !ok {
+			return helm.Release{}, fmt.Errorf("cilium values for csp %q not found", i.csp.String())
+		}
 	case certManagerInfo.releaseName:
 		values = i.loadCertManagerValues()
 	case constellationOperatorsInfo.releaseName: