diff --git a/components/common-go/baseserver/config.go b/components/common-go/baseserver/config.go
index 6258320b18749a..d611bf0ee6272f 100644
--- a/components/common-go/baseserver/config.go
+++ b/components/common-go/baseserver/config.go
@@ -15,7 +15,7 @@ type ServicesConfiguration struct {
 
 type ServerConfiguration struct {
 	Address string            `json:"address" yaml:"address"`
-	TLS     *TLSConfiguration `json:"tls" yaml:"tls"`
+	TLS     *TLSConfiguration `json:"tls,omitempty" yaml:"tls,omitempty"`
 }
 
 // GetAddress returns the configured address or an empty string of s is nil
diff --git a/install/installer/pkg/components/usage/configmap_test.go b/install/installer/pkg/components/usage/configmap_test.go
index 4c925ed0832932..8f1595eae1da3e 100644
--- a/install/installer/pkg/components/usage/configmap_test.go
+++ b/install/installer/pkg/components/usage/configmap_test.go
@@ -27,8 +27,7 @@ func TestConfigMap_ContainsSchedule(t *testing.T) {
        "server": {
          "services": {
            "grpc": {
-             "address": ":9001",
-             "tls": null
+             "address": ":9001"
            }
          }
        }