diff --git a/cmd/kubectl-testkube/commands/common/helper.go b/cmd/kubectl-testkube/commands/common/helper.go
index f8b944bedfd..7a779bc503e 100644
--- a/cmd/kubectl-testkube/commands/common/helper.go
+++ b/cmd/kubectl-testkube/commands/common/helper.go
@@ -393,16 +393,6 @@ func PopulateCloudConfig(cfg config.Data, apiKey string, opts *HelmOptions) conf
 	cfg.CloudContext.UiUri = opts.Master.URIs.Ui
 	cfg.CloudContext.AgentUri = opts.Master.URIs.Agent
 
-	if cfg.CloudContext.ApiKey != "" {
-		var err error
-		cfg, err = PopulateOrgAndEnvNames(cfg, opts.Master.OrgId, opts.Master.EnvId, opts.Master.URIs.Api)
-		if err != nil {
-			ui.Failf("Error populating org and env names: %s", err)
-		}
-	} else {
-		ui.Warn("No API key provided, you need to login to Testkube Cloud")
-	}
-
 	return cfg
 }
 
diff --git a/cmd/kubectl-testkube/commands/context/set.go b/cmd/kubectl-testkube/commands/context/set.go
index 35a02508a92..3fa0638f82a 100644
--- a/cmd/kubectl-testkube/commands/context/set.go
+++ b/cmd/kubectl-testkube/commands/context/set.go
@@ -48,6 +48,16 @@ func NewSetContextCmd() *cobra.Command {
 
 				cfg = common.PopulateCloudConfig(cfg, apiKey, &opts)
 
+				if cfg.CloudContext.ApiKey != "" {
+					var err error
+					cfg, err = common.PopulateOrgAndEnvNames(cfg, opts.Master.OrgId, opts.Master.EnvId, opts.Master.URIs.Api)
+					if err != nil {
+						ui.Failf("Error populating org and env names: %s", err)
+					}
+				} else {
+					ui.Warn("No API key provided, you need to login to Testkube Cloud")
+				}
+
 			case config.ContextTypeKubeconfig:
 				// kubeconfig special use cases