diff --git a/pkg/config/config.go b/pkg/config/config.go
index 3c571e209..711ceeeeb 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -568,8 +568,10 @@ func (c *Config) CurrentContextCluster() (*Cluster, error) {
 	if err != nil {
 		return nil, err
 	}
+	clusterName := NewClusterComplexName()
+	clusterName.FromName(currentContext.KubeContext().Cluster)
 
-	return c.Clusters[currentContext.KubeContext().Cluster].ClusterTypes[currentContext.ClusterType()], nil
+	return c.Clusters[clusterName.ClusterName()].ClusterTypes[currentContext.ClusterType()], nil
 }
 
 func (c *Config) CurrentContextAuthInfo() (*AuthInfo, error) {