diff --git a/pkg/deploy/proxy.go b/pkg/deploy/proxy.go
index cda6330036..2a904768da 100644
--- a/pkg/deploy/proxy.go
+++ b/pkg/deploy/proxy.go
@@ -122,7 +122,9 @@ func ReadCheClusterProxyConfiguration(ctx *chetypes.DeployContext) (*chetypes.Pr
 }
 
 func MergeNonProxy(noProxy1 string, noProxy2 string) string {
-	if noProxy1 == "" {
+	if noProxy1 == "" && noProxy2 == "" {
+		return ""
+	} else if noProxy1 == "" {
 		return noProxy2
 	} else if noProxy2 == "" {
 		return noProxy1
diff --git a/pkg/deploy/server/server_configmap.go b/pkg/deploy/server/server_configmap.go
index e7145aee83..99e822a034 100644
--- a/pkg/deploy/server/server_configmap.go
+++ b/pkg/deploy/server/server_configmap.go
@@ -15,7 +15,6 @@ package server
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"strconv"
 	"strings"
 
@@ -89,11 +88,6 @@ func (s *CheServerReconciler) getCheConfigMapData(ctx *chetypes.DeployContext) (
 	proxyJavaOpts := ""
 	cheWorkspaceNoProxy := ctx.Proxy.NoProxy
 	if ctx.Proxy.HttpProxy != "" {
-		if ctx.Proxy.NoProxy == "" {
-			cheWorkspaceNoProxy = os.Getenv("KUBERNETES_SERVICE_HOST")
-		} else {
-			cheWorkspaceNoProxy = cheWorkspaceNoProxy + "," + os.Getenv("KUBERNETES_SERVICE_HOST")
-		}
 		proxyJavaOpts, err = deploy.GenerateProxyJavaOpts(ctx.Proxy, cheWorkspaceNoProxy)
 		if err != nil {
 			logrus.Errorf("Failed to generate java proxy options: %v", err)