diff --git a/pkg/models/kubeconfig/kubeconfig.go b/pkg/models/kubeconfig/kubeconfig.go
index ecb1e5f5b..e6657478b 100644
--- a/pkg/models/kubeconfig/kubeconfig.go
+++ b/pkg/models/kubeconfig/kubeconfig.go
@@ -181,7 +181,7 @@ func (o *operator) GetKubeConfig(username string) (string, error) {
 	masterURL := o.masterURL
 
 	// server host override
-	if cluster := kubeconfig.Clusters[defaultClusterName]; cluster != nil {
+	if cluster := kubeconfig.Clusters[defaultClusterName]; cluster != nil && masterURL != "" {
 		cluster.Server = masterURL
 	}