diff --git a/stable/openldap/README.md b/stable/openldap/README.md
index 77cab81a3e9f..3496c40ebb7c 100644
--- a/stable/openldap/README.md
+++ b/stable/openldap/README.md
@@ -34,7 +34,7 @@ The following table lists the configurable parameters of the openldap chart and
 | `podAnnotations`                   | Annotations to add to the pod                                                                                                             | `{}`                |
 | `existingSecret`                   | Use an existing secret for admin and config user passwords                                                                                | `""`                |
 | `service.annotations`              | Annotations to add to the service                                                                                                         | `{}`                |
-| `service.clusterIP`                | IP address to assign to the service                                                                                                       | `""`                |
+| `service.clusterIP`                | IP address to assign to the service                                                                                                       | `nil`                |
 | `service.externalIPs`              | Service external IP addresses                                                                                                             | `[]`                |
 | `service.ldapPort`                 | External service port for LDAP                                                                                                            | `389`               |
 | `service.loadBalancerIP`           | IP address to assign to load balancer (if supported)                                                                                      | `""`                |
diff --git a/stable/openldap/templates/service.yaml b/stable/openldap/templates/service.yaml
index eb7f876f08b1..987907728dad 100644
--- a/stable/openldap/templates/service.yaml
+++ b/stable/openldap/templates/service.yaml
@@ -15,7 +15,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
 spec:
-  clusterIP: {{ .Values.service.clusterIP | quote }}
+  {{ with .Values.service.clusterIP }}clusterIP: {{ . }}{{ end }}
 {{- if .Values.service.externalIPs }}
   externalIPs:
 {{ toYaml .Values.service.externalIPs | indent 4 }}
diff --git a/stable/openldap/values.yaml b/stable/openldap/values.yaml
index c760629fec66..f6aeedb8bbf1 100644
--- a/stable/openldap/values.yaml
+++ b/stable/openldap/values.yaml
@@ -38,7 +38,7 @@ extraLabels: {}
 podAnnotations: {}
 service:
   annotations: {}
-  clusterIP: ""
+  clusterIP: nil
 
   ldapPort: 389
   sslLdapPort: 636  # Only used if tls.enabled is true